salam/nuhodds_fi4
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip event mapper

Browse Source
This commit is contained in:
salam committed 2026-02-04 12:47:48 +01:00
1 parent 75b8c6c3ab
commit 3a289dd776
17 files changed
+273 -157
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/Filament/Resources/Events/Tables/EventsTable.php
+1
View File
@@ -68,6 +68,7 @@ class EventsTable
->poll('10s') ->poll('10s')
->deferLoading() ->deferLoading()
->defaultPaginationPageOption(5) ->defaultPaginationPageOption(5)
->extremePaginationLinks()
->paginated([5, 10, 15]) ->paginated([5, 10, 15])
->columns([ ->columns([
IconColumn::make('sport.icon') IconColumn::make('sport.icon')
app/Filament/Resources/Users/Schemas/UserForm.php
+4 -10
View File
@@ -3,7 +3,6 @@
namespace App\Filament\Resources\Users\Schemas; namespace App\Filament\Resources\Users\Schemas;
use App\Models\Bookmaker; use App\Models\Bookmaker;
use App\Models\Client;
use Filament\Forms\Components\Hidden; use Filament\Forms\Components\Hidden;
use Filament\Forms\Components\Select; use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput; use Filament\Forms\Components\TextInput;
@@ -55,21 +54,16 @@ class UserForm
Select::make('client_id') Select::make('client_id')
->relationship('client', 'name') ->relationship('client', 'name')
->preload(), ->preload(),
Select::make('provider_id')
->relationship('provider', 'name')
->preload(),
Select::make('bookmaker_id') Select::make('bookmaker_id')
->label('Active Bookmaker') ->label('Active Bookmaker')
->options(fn () => Bookmaker::query()->where('is_client', 1)->pluck('name', 'id')) ->options(fn () => Bookmaker::query()->where('is_client', 1)->pluck('name', 'id'))
->preload(), ->preload(),
Select::make('partner_bookmaker_id') Select::make('partner_bookmaker_id')
->label('Partner Bookmaker') ->label('Partner Bookmaker')
->options(function () { ->options(fn () => Bookmaker::query()->where('is_client', 1)->pluck('name', 'id'))
$bookmaker = Client::where('id', auth()->user()->client_id)->value('bookmaker');
return Bookmaker::query()->whereIn('id', $bookmaker)->pluck('name', 'id');
})
->preload(),
Select::make('provider_id')
->relationship('provider', 'name')
->preload(), ->preload(),
]), ]),
Section::make('Authorisations') Section::make('Authorisations')
app/Livewire/AlarmBookmaker.php
+15 -14
View File
@@ -50,22 +50,22 @@ class AlarmBookmaker extends Component implements HasActions, HasSchemas, HasTab
->where('sport_id', auth()->user()->sport_id)) ->where('sport_id', auth()->user()->sport_id))
->paginated(false) ->paginated(false)
->columns([ ->columns([
IconColumn::make('sport.icon') // IconColumn::make('sport.icon')
->label('') // ->label('')
->width('1rem') // ->width('1rem')
->icon(function ($record): string { // ->icon(function ($record): string {
return $record->sport->icon; // return $record->sport->icon;
}) // })
->color(fn ($record): string => match ($record->level_id) { // ->color(fn ($record): string => match ($record->level_id) {
1 => 'success', // 1 => 'success',
2 => 'warning', // 2 => 'warning',
3 => 'danger', // 3 => 'danger',
}), // }),
TextColumn::make('sport.name'), // TextColumn::make('sport.name'),
TextColumn::make('multiline_setting.name')->label('Bettype'),
TextColumn::make('name') TextColumn::make('name')
->badge()
->color(fn ($record): string => match ($record->level_id) { ->color(fn ($record): string => match ($record->level_id) {
1 => 'success', 1 => 'info',
2 => 'warning', 2 => 'warning',
3 => 'danger', 3 => 'danger',
}), }),
@@ -74,6 +74,7 @@ class AlarmBookmaker extends Component implements HasActions, HasSchemas, HasTab
->width('2rem') ->width('2rem')
->prefix('Threshold:') ->prefix('Threshold:')
->rules(['required', 'decimal:2', 'between:0,2']), ->rules(['required', 'decimal:2', 'between:0,2']),
TextColumn::make('multiline_setting.name')->label('Bettype'),
ToggleColumn::make('disabled'), ToggleColumn::make('disabled'),
]) ])
->defaultSort('level_id') ->defaultSort('level_id')
app/Livewire/ComparingBookmakerMenu.php
+2 -1
View File
@@ -48,7 +48,6 @@ class ComparingBookmakerMenu extends Component implements HasActions, HasSchemas
->reorderRecordsTriggerAction(function (Action $action) { ->reorderRecordsTriggerAction(function (Action $action) {
return $action->button(); return $action->button();
}) })
->paginated(false)
->striped() ->striped()
->query(ComparingBookmaker::query() ->query(ComparingBookmaker::query()
->with('bookmaker') ->with('bookmaker')
@@ -56,8 +55,10 @@ class ComparingBookmakerMenu extends Component implements HasActions, HasSchemas
->where('client_bookmaker_id', $this->user->bookmaker_id) ->where('client_bookmaker_id', $this->user->bookmaker_id)
->orderBy('sorting') ->orderBy('sorting')
) )
->deferLoading()
->defaultPaginationPageOption(10) ->defaultPaginationPageOption(10)
->paginated([5, 10, 15, 30, 50]) ->paginated([5, 10, 15, 30, 50])
->extremePaginationLinks()
->columns([ ->columns([
TextColumn::make('Position') TextColumn::make('Position')
->alignCenter() ->alignCenter()
app/Livewire/MapperLeft.php
+114 -24
View File
@@ -10,6 +10,7 @@ use App\Models\Country;
use App\Models\Event; use App\Models\Event;
use App\Models\Mapper; use App\Models\Mapper;
use Carbon\Carbon; use Carbon\Carbon;
use CodeWithKyrian\FilamentDateRange\Forms\Components\DateRangePicker;
use Filament\Actions\Action; use Filament\Actions\Action;
use Filament\Actions\Concerns\InteractsWithActions; use Filament\Actions\Concerns\InteractsWithActions;
use Filament\Actions\Contracts\HasActions; use Filament\Actions\Contracts\HasActions;
@@ -18,7 +19,10 @@ use Filament\Schemas\Components\Utilities\Get;
use Filament\Schemas\Concerns\InteractsWithSchemas; use Filament\Schemas\Concerns\InteractsWithSchemas;
use Filament\Schemas\Contracts\HasSchemas; use Filament\Schemas\Contracts\HasSchemas;
use Filament\Support\Enums\Alignment; use Filament\Support\Enums\Alignment;
use Filament\Support\Enums\FontWeight;
use Filament\Support\Enums\Size; use Filament\Support\Enums\Size;
use Filament\Tables\Columns\IconColumn;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Concerns\InteractsWithTable; use Filament\Tables\Concerns\InteractsWithTable;
use Filament\Tables\Contracts\HasTable; use Filament\Tables\Contracts\HasTable;
use Filament\Tables\Enums\FiltersLayout; use Filament\Tables\Enums\FiltersLayout;
@@ -68,10 +72,74 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable
return $table return $table
->query(LoadEvents::load($this->search_left, auth()->user()->sport_id)) ->query(LoadEvents::load($this->search_left, auth()->user()->sport_id))
->columns([ ->columns([
TextColumn::make('starttime')
->sortable()
->time('H:i')
->alignCenter()
->description(fn ($record): string => Carbon::parse($record->starttime)->format('d. M. y')),
IconColumn::make('country.icon')->icon(fn (string $state): string => $state)->label(''),
TextColumn::make('competition_group.name')->label('Group')
->wrap()
->tooltip('Click to filter by this group')
->description(fn ($record): string => $record->country->name)
->action(function ($record) {
if (! in_array($record->competition_group_id, $this->tableFilters['events']['competition_group_id'])) {
$this->tableFilters['events']['competition_group_id'][] = (string) $record->competition_group_id;
$this->dispatch('refreshMapperRight');
}
}),
TextColumn::make('home.name')
->label('Home')
->color('home')
->weight(FontWeight::Bold)
->alignRight(),
IconColumn::make('id')->icon('phosphor-minus')->label('')->color('black'),
TextColumn::make('away.name')
->color('away')
->label('Away')
->weight(FontWeight::Bold),
MapperLeftColumn::make('left')->label(''), MapperLeftColumn::make('left')->label(''),
])->recordActions([
Action::make('search_home')
->iconButton()
->icon('phosphor-magnifying-glass')
->color('home')
->action(function ($record) {
$this->dispatch('search_right', $record->home->name);
}),
Action::make('search_away')
->icon('phosphor-magnifying-glass')
->iconButton()
->color('away')
->action(function ($record) {
$this->dispatch('search_right', $record->away->name);
}),
// Action::make('drag_left')
// ->icon('phosphor-arrows-out')
// ->iconButton()
// ->extraAttributes([
// 'x-data' => '{ moveoverleft: false }',
// 'x-on' => '{
// dragstart = {
// self: dragging = true;
// event.dataTransfer.effectAllowed = "move;
// event.dataTransfer.setData("text/plain", event.target.id)
// },
// dragover = {
// prevent: "moveoverleft = true"
// },
// dragleave = {
// prevent: "moveoverleft = false"
// }
// }',
// ])
// ->action(function ($record) {
// $this->dispatch('search_right', $record->away->name);
// }),
]) ])
->defaultSort('starttime')
->searchable(['home.name', 'away.name']) ->searchable(['home.name', 'away.name'])
->defaultPaginationPageOption(5) ->defaultPaginationPageOption(10)
->filters([ ->filters([
Filter::make('events') Filter::make('events')
->schema([ ->schema([
@@ -79,7 +147,6 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable
->placeholder('Country') ->placeholder('Country')
->hiddenLabel() ->hiddenLabel()
// ->multiple() // ->multiple()
->columnSpan(2)
->searchable() ->searchable()
->preload() ->preload()
->options(function () { ->options(function () {
@@ -96,30 +163,24 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable
->placeholder('League') ->placeholder('League')
->hiddenLabel() ->hiddenLabel()
->label('') ->label('')
->columnSpan(2)
->multiple() ->multiple()
->searchable() ->searchable()
->options(function (Get $get) { ->options(function (Get $get) {
if ($get('country_id')) { return CompetitionGroup::where('sport_id', auth()->user()->sport_id)
$res = Event::query()->where('sport_id', auth()->user()->sport_id)->where('betradar_id', 0)->where('starttime', '>', Carbon::now())->where('country_id', $get('country_id'))->groupBy('competition_group_id')->pluck('competition_group_id')->toArray(); ->whereHas('event', function ($query) {
} else { $query->where('starttime', '>', now())
$res = Event::query()->where('sport_id', auth()->user()->sport_id)->where('betradar_id', 0)->where('starttime', '>', Carbon::now())->groupBy('competition_group_id')->pluck('competition_group_id')->toArray(); ->where('betradar_id', 0);
}
$comps = CompetitionGroup::with('country')->where('id', $res)->get();
$arr = [];
foreach ($comps as $val) {
if (isset($val->country->name)) {
$arr[$val->id] = $val->country->name.' - '.$val->name;
} else {
$arr[$val->id] = $val->name;
}
}
asort($arr);
return $arr;
}) })
->orderBy('name')
->pluck('name', 'id');
})
->live(),
DateRangePicker::make('starttime_period')
->columnSpan(2)
->displayFormat('d M Y')
->minDate(now())
->hiddenLabel()
->label('')
->live(), ->live(),
]) ])
->query(function (Builder $query, array $data): Builder { ->query(function (Builder $query, array $data): Builder {
@@ -129,8 +190,36 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable
fn (Builder $query, $country_id) => $query->where('country_id', $country_id) fn (Builder $query, $country_id) => $query->where('country_id', $country_id)
)->when( )->when(
$data['competition_group_id'], $data['competition_group_id'],
fn (Builder $query, $competition_group_id) => $query->whereIn('competition_group_id', $competition_group_id) function (Builder $query, $competition_group_id) {
); $this->setPage(1);
return $query->whereIn('competition_group_id', $competition_group_id);
}
)->when(
$data['starttime_period'],
function (Builder $query, $starttime_period) {
// dd($starttime_period);
if (isset($starttime_period['start']) && isset($starttime_period['end'])) {
$from = Carbon::createFromDate($starttime_period['start']);
$end = Carbon::createFromDate($starttime_period['end']);
return $query
->whereDate('starttime', '>=', $from->format('Y-m-d 00:00:00'))
->whereDate('starttime', '<=', $end->format('Y-m-d 00:00:00'));
} elseif (isset($starttime_period['start'])) {
$from = Carbon::createFromDate($starttime_period['start']);
return $query
->whereDate('starttime', '>=', $from->format('Y-m-d 00:00:00'));
} elseif (isset($starttime_period['end'])) {
$end = Carbon::createFromDate($starttime_period['end']);
return $query
->whereDate('starttime', '<=', $end->format('Y-m-d 00:00:00'));
}
});
})->indicateUsing(function (): array { })->indicateUsing(function (): array {
$indicators = []; $indicators = [];
if ($this->search_left) { if ($this->search_left) {
@@ -150,6 +239,7 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable
->toolbarActions([ ->toolbarActions([
Action::make('refreshMapperLeft') Action::make('refreshMapperLeft')
->hiddenLabel() ->hiddenLabel()
->color('gray')
->icon('phosphor-x') ->icon('phosphor-x')
->size(Size::Small) ->size(Size::Small)
->action(function (Component $livewire) { ->action(function (Component $livewire) {
app/Livewire/MapperRight.php
+88 -7
View File
@@ -8,6 +8,7 @@ use App\Livewire\Mapper\StoreMapped;
use App\Models\Country; use App\Models\Country;
use App\Models\Event; use App\Models\Event;
use App\Models\Mapper; use App\Models\Mapper;
use CodeWithKyrian\FilamentDateRange\Forms\Components\DateRangePicker;
use Filament\Actions\Action; use Filament\Actions\Action;
use Filament\Actions\Concerns\InteractsWithActions; use Filament\Actions\Concerns\InteractsWithActions;
use Filament\Actions\Contracts\HasActions; use Filament\Actions\Contracts\HasActions;
@@ -16,10 +17,14 @@ use Filament\Schemas\Components\Utilities\Get;
use Filament\Schemas\Concerns\InteractsWithSchemas; use Filament\Schemas\Concerns\InteractsWithSchemas;
use Filament\Schemas\Contracts\HasSchemas; use Filament\Schemas\Contracts\HasSchemas;
use Filament\Support\Enums\Alignment; use Filament\Support\Enums\Alignment;
use Filament\Support\Enums\FontWeight;
use Filament\Support\Enums\Size; use Filament\Support\Enums\Size;
use Filament\Tables\Columns\IconColumn;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Concerns\InteractsWithTable; use Filament\Tables\Concerns\InteractsWithTable;
use Filament\Tables\Contracts\HasTable; use Filament\Tables\Contracts\HasTable;
use Filament\Tables\Enums\FiltersLayout; use Filament\Tables\Enums\FiltersLayout;
use Filament\Tables\Enums\RecordActionsPosition;
use Filament\Tables\Filters\Filter; use Filament\Tables\Filters\Filter;
use Filament\Tables\Filters\Indicator; use Filament\Tables\Filters\Indicator;
use Filament\Tables\Table; use Filament\Tables\Table;
@@ -67,8 +72,47 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
->query(LoadProvider::load($this->search_right, auth()->user())) ->query(LoadProvider::load($this->search_right, auth()->user()))
->columns([ ->columns([
MapperRightColumn::make('right')->label(''), MapperRightColumn::make('right')->label(''),
TextColumn::make('home')
->color('home')
->weight(FontWeight::Bold)
->alignRight(),
IconColumn::make('id')->icon('phosphor-minus')->label('')->color('black'),
TextColumn::make('away')
->color('away')
->weight(FontWeight::Bold),
TextColumn::make('group')
->wrap()
->tooltip('Click to filter by this group')
->description(fn ($record): string => $record->country_betsapi?->name.' '.$record->country)
->action(function ($record) {
if (! in_array($record->group_id, $this->tableFilters['events']['group_id'])) {
$this->tableFilters['events']['group_id'][] = (string) $record->group_id;
$this->dispatch('refreshMapperRight');
}
}),
IconColumn::make('group_cc')->icon(fn (string $state): string => 'flag-country-'.$state)->label(''),
TextColumn::make('starttime')
->sortable()
->time('H:i')
->alignCenter()
->description(fn ($record): string => Carbon::parse($record->starttime)->format('d. M. y')),
])->searchable(['home', 'away']) ])->searchable(['home', 'away'])
->defaultPaginationPageOption(5) ->recordActions([
Action::make('search_home')
->iconButton()
->icon('phosphor-magnifying-glass')
->color('home')
->action(function ($record) {
$this->dispatch('search_left', $record->home);
}),
Action::make('search_away')
->icon('phosphor-magnifying-glass')
->iconButton()
->color('away')
->action(function ($record) {
$this->dispatch('search_left', $record->away);
}),
], position: RecordActionsPosition::BeforeColumns)
->filters([ ->filters([
Filter::make('events') Filter::make('events')
->schema([ ->schema([
@@ -80,7 +124,6 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
->searchable() ->searchable()
->preload() ->preload()
// ->multiple() // ->multiple()
->columnSpan(2)
->live() ->live()
->options(function (Get $get) { ->options(function (Get $get) {
return Mapper::query()->where('sport_id', auth()->user()->sport_id)->where('provider_id', auth()->user()->provider_id)->where('starttime', '>', Carbon::now())->groupBy('country_id')->pluck('country', 'country_id')->toArray(); return Mapper::query()->where('sport_id', auth()->user()->sport_id)->where('provider_id', auth()->user()->provider_id)->where('starttime', '>', Carbon::now())->groupBy('country_id')->pluck('country', 'country_id')->toArray();
@@ -98,7 +141,6 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
->searchable() ->searchable()
->preload() ->preload()
// ->multiple() // ->multiple()
->columnSpan(2)
->live() ->live()
->options(function () { ->options(function () {
$res = Mapper::query()->where('sport_id', auth()->user()->sport_id)->where('provider_id', auth()->user()->provider_id)->where('starttime', '>', Carbon::now())->groupBy('group_cc')->pluck('group_cc')->toArray(); $res = Mapper::query()->where('sport_id', auth()->user()->sport_id)->where('provider_id', auth()->user()->provider_id)->where('starttime', '>', Carbon::now())->groupBy('group_cc')->pluck('group_cc')->toArray();
@@ -115,7 +157,6 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
->label('Leagues') ->label('Leagues')
->hiddenLabel() ->hiddenLabel()
->label('') ->label('')
->columnSpan(2)
->searchable() ->searchable()
->preload() ->preload()
->multiple() ->multiple()
@@ -129,6 +170,13 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
} }
}) })
->live(), ->live(),
DateRangePicker::make('starttime_period')
->columnSpan(2)
->displayFormat('d M Y')
->minDate(now())
->hiddenLabel()
->label('')
->live(),
]) ])
->query(function (Builder $query, array $data): Builder { ->query(function (Builder $query, array $data): Builder {
return $query return $query
@@ -140,8 +188,36 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
fn (Builder $query, $group_cc) => $query->where('group_cc', $group_cc) fn (Builder $query, $group_cc) => $query->where('group_cc', $group_cc)
)->when( )->when(
$data['group_id'], $data['group_id'],
fn (Builder $query, $group_id) => $query->whereIn('group_id', $group_id) function (Builder $query, $group_id) {
); $this->setPage(1);
return $query->whereIn('group_id', $group_id);
}
)->when(
$data['starttime_period'],
function (Builder $query, $starttime_period) {
// dd($starttime_period);
if (isset($starttime_period['start']) && isset($starttime_period['end'])) {
$from = Carbon::createFromDate($starttime_period['start']);
$end = Carbon::createFromDate($starttime_period['end']);
return $query
->whereDate('starttime', '>=', $from->format('Y-m-d 00:00:00'))
->whereDate('starttime', '<=', $end->format('Y-m-d 00:00:00'));
} elseif (isset($starttime_period['start'])) {
$from = Carbon::createFromDate($starttime_period['start']);
return $query
->whereDate('starttime', '>=', $from->format('Y-m-d 00:00:00'));
} elseif (isset($starttime_period['end'])) {
$end = Carbon::createFromDate($starttime_period['end']);
return $query
->whereDate('starttime', '<=', $end->format('Y-m-d 00:00:00'));
}
});
})->indicateUsing(function (): array { })->indicateUsing(function (): array {
$indicators = []; $indicators = [];
if ($this->search_right) { if ($this->search_right) {
@@ -154,14 +230,19 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
return $indicators; return $indicators;
}) })
->columns(4)->columnSpan(4), ->columns(4)->columnSpan(4),
], layout: FiltersLayout::AboveContent) ], layout: FiltersLayout::AboveContent)
// IconColumn::make('search_home')->icon('phosphor-magnifying-magnifying')->label('')->color('home')->width(30),
// IconColumn::make('search_away')->icon('phosphor-magnifying-glass')->label('')->color('away')->width(30),
// ->hiddenFilterIndicators() // ->hiddenFilterIndicators()
->defaultPaginationPageOption(10)
->persistFiltersInSession() ->persistFiltersInSession()
->filtersFormColumns(3) ->filtersFormColumns(3)
->deferFilters(false) ->deferFilters(false)
->toolbarActions([ ->toolbarActions([
Action::make('refreshMapperRight') Action::make('refreshMapperRight')
->hiddenLabel() ->hiddenLabel()
->color('gray')
->icon('phosphor-x') ->icon('phosphor-x')
->size(Size::Small) ->size(Size::Small)
->action(function (Component $livewire) { ->action(function (Component $livewire) {
@@ -170,7 +251,7 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
$livewire->fill(['tableSearch' => '']); $livewire->fill(['tableSearch' => '']);
$livewire->resetTableFiltersForm(); // Clears all filters $livewire->resetTableFiltersForm(); // Clears all filters
$this->dispatch('refreshMapperRight'); $this->dispatch('refreshMapperRight');
$this->dispatch('refreshMapperLeft'); // $this->dispatch('refreshMapperLeft');
}), }),
]); ]);
} }
app/Models/CompetitionGroup.php
+5
View File
@@ -14,6 +14,11 @@ class CompetitionGroup extends Model
'level', 'level',
]; ];
public function event()
{
return $this->belongsTo(Event::class, 'id', 'competition_group_id');
}
public function sport() public function sport()
{ {
return $this->belongsTo(Sport::class); return $this->belongsTo(Sport::class);
app/Providers/AppServiceProvider.php
+4
View File
@@ -76,6 +76,10 @@ class AppServiceProvider extends ServiceProvider
// break; // break;
// } // }
// }); // });
FilamentColor::register([
'home' => Color::Sky,
'away' => Color::Lime,
]);
// FilamentColor::register([ // FilamentColor::register([
// 'danger' => Color::Red, // 'danger' => Color::Red,
composer.lock
Generated
+16 -16
View File
@@ -543,16 +543,16 @@
}, },
{ {
"name": "brick/math", "name": "brick/math",
"version": "0.14.4", "version": "0.14.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/brick/math.git", "url": "https://github.com/brick/math.git",
"reference": "a8b53e6cc4d3a336543f042a4dfa0e3f2f2356a4" "reference": "618a8077b3c326045e10d5788ed713b341fcfe40"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/brick/math/zipball/a8b53e6cc4d3a336543f042a4dfa0e3f2f2356a4", "url": "https://api.github.com/repos/brick/math/zipball/618a8077b3c326045e10d5788ed713b341fcfe40",
"reference": "a8b53e6cc4d3a336543f042a4dfa0e3f2f2356a4", "reference": "618a8077b3c326045e10d5788ed713b341fcfe40",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -591,7 +591,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/brick/math/issues", "issues": "https://github.com/brick/math/issues",
"source": "https://github.com/brick/math/tree/0.14.4" "source": "https://github.com/brick/math/tree/0.14.5"
}, },
"funding": [ "funding": [
{ {
@@ -599,7 +599,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2026-02-02T16:57:31+00:00" "time": "2026-02-03T18:06:51+00:00"
}, },
{ {
"name": "carbonphp/carbon-doctrine-types", "name": "carbonphp/carbon-doctrine-types",
@@ -4579,16 +4579,16 @@
}, },
{ {
"name": "nette/utils", "name": "nette/utils",
"version": "v4.1.1", "version": "v4.1.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nette/utils.git", "url": "https://github.com/nette/utils.git",
"reference": "c99059c0315591f1a0db7ad6002000288ab8dc72" "reference": "f76b5dc3d6c6d3043c8d937df2698515b99cbaf5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nette/utils/zipball/c99059c0315591f1a0db7ad6002000288ab8dc72", "url": "https://api.github.com/repos/nette/utils/zipball/f76b5dc3d6c6d3043c8d937df2698515b99cbaf5",
"reference": "c99059c0315591f1a0db7ad6002000288ab8dc72", "reference": "f76b5dc3d6c6d3043c8d937df2698515b99cbaf5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -4601,7 +4601,7 @@
"require-dev": { "require-dev": {
"jetbrains/phpstorm-attributes": "^1.2", "jetbrains/phpstorm-attributes": "^1.2",
"nette/tester": "^2.5", "nette/tester": "^2.5",
"phpstan/phpstan-nette": "^2.0@stable", "phpstan/phpstan": "^2.0@stable",
"tracy/tracy": "^2.9" "tracy/tracy": "^2.9"
}, },
"suggest": { "suggest": {
@@ -4662,9 +4662,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/nette/utils/issues", "issues": "https://github.com/nette/utils/issues",
"source": "https://github.com/nette/utils/tree/v4.1.1" "source": "https://github.com/nette/utils/tree/v4.1.2"
}, },
"time": "2025-12-22T12:14:32+00:00" "time": "2026-02-03T17:21:09+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
@@ -12982,12 +12982,12 @@
], ],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": [], "stability-flags": {},
"prefer-stable": true, "prefer-stable": true,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"php": "^8.3" "php": "^8.3"
}, },
"platform-dev": [], "platform-dev": {},
"plugin-api-version": "2.6.0" "plugin-api-version": "2.9.0"
} }
database/seeders/RolesAndPermissionsSeeder.php
+1 -1
View File
@@ -75,7 +75,7 @@ class RolesAndPermissionsSeeder extends Seeder
'client_id' => 2, 'client_id' => 2,
'sport_id' => 1, 'sport_id' => 1,
'bookmaker_id' => 35, 'bookmaker_id' => 35,
'partner_bookmaker_id' => 34, 'partner_bookmaker_id' => 36,
'provider_id' => 5, 'provider_id' => 5,
]); ]);
$user->assignRole('regular_user'); $user->assignRole('regular_user');
resources/views/filament/tables/columns/mapper-left-column.blade.php
+2 -34
View File
@@ -1,5 +1,4 @@
<li class="w-full h-full overflow-hidden p-1 cursor-grab flex space-x-4 drag-and-drop__item px-4" x-data="{ moveoverleft: false }" <li class="cursor-grab drag-and-drop__item" x-data="{ moveoverleft: false }" id={{ $record->id }}
id={{ $record->id }}
x-on:dragstart.self=" x-on:dragstart.self="
dragging = true; dragging = true;
event.dataTransfer.effectAllowed = 'move'; event.dataTransfer.effectAllowed = 'move';
@@ -8,42 +7,11 @@
x-on:drop="moveoverleft = false" :class="moveoverleft ? 'bg-primary-500/20!' : ''" x-on:drop="moveoverleft = false" :class="moveoverleft ? 'bg-primary-500/20!' : ''"
x-on:drop.prevent=" x-on:drop.prevent="
const id = event.dataTransfer.getData('text/plain'); const id = event.dataTransfer.getData('text/plain');
const target = event.target.closest('li'); const target = event.target.closest('div');
if(document.getElementById(id).getAttribute('mapper') !=target.getAttribute('mapper')) if(document.getElementById(id).getAttribute('mapper') !=target.getAttribute('mapper'))
$wire.mountAction('left', { event_id: id, id: target.id });" $wire.mountAction('left', { event_id: id, id: target.id });"
draggable="true" mapper="left"> draggable="true" mapper="left">
<div class="w-10 flex-none mx-auto my-auto">
@if($record->country?->icon)
<x-icon name="{{ $record->country->icon }}" class="h5 w-5" />
@endif
</div>
@include('filament.tables.columns.parts.search-button-left', [
'find' => $record->home->name,
])
<div class="flex-1 flex flex-col justify-center space-y-0">
<div class="flex justify-around text-gray-600 dark:text-gray-500">
<div>{{ $record->starttime }}</div>
<div>{{ $record->id }}</div>
</div>
<div class="flex justify-center space-x-4">
<div class="text-right font-bold text-wrap">{{ $record->home->name }}</div>
<div class="w-6 text-center">-</div>
<div class="text-left font-bold text-wrap">{{ $record->away->name }}</div>
</div>
<div class="flex justify-center space-x-4 text-gray-600 dark:text-gray-500">
<div>{{ $record->country?->name }}</div>
<div>{{ $record->competition_group->name }}</div>
</div>
</div>
@include('filament.tables.columns.parts.search-button-left', [
'find' => $record->away->name,
])
@include('filament.tables.columns.parts.move-botton') @include('filament.tables.columns.parts.move-botton')
</li> </li>
resources/views/filament/tables/columns/mapper-right-column.blade.php
+1 -34
View File
@@ -1,6 +1,4 @@
<li class="w-full h-full overflow-hidden p-1 cursor-grab flex <li class="cursor-grab drag-and-drop__item" x-data="{ moveoverright: false }" id={{ $record->event_id }}
space-x-4 drag-and-drop__item px-4"
x-data="{ moveoverright: false }" id={{ $record->event_id }}
x-on:dragstart.self=" x-on:dragstart.self="
dragging = true; dragging = true;
event.dataTransfer.effectAllowed = 'move'; event.dataTransfer.effectAllowed = 'move';
@@ -15,35 +13,4 @@
draggable="true" mapper="right"> draggable="true" mapper="right">
@include('filament.tables.columns.parts.move-botton') @include('filament.tables.columns.parts.move-botton')
@include('filament.tables.columns.parts.search-button-right', [
'find' => $record->home,
])
<div class="flex-1 flex flex-col justify-center space-y-0">
<div class="flex justify-around text-gray-600 dark:text-gray-500">
<div>{{ $record->starttime }}</div>
<div>{{ $record->event_id }}</div>
</div>
<div class="flex justify-center space-x-4">
<div class="text-right font-bold text-wrap">{{ $record->home }}</div>
<div class="w-6 text-center">-</div>
<div class="text-left font-bold text-wrap">{{ $record->away }}</div>
</div>
<div class="flex justify-center space-x-4 text-gray-600 dark:text-gray-500">
<div>{{ $record->country }}</div>
<div>{{ $record->country_betsapi?->name }}</div>
<div>{{ $record->group }}</div>
</div>
</div>
@include('filament.tables.columns.parts.search-button-right', [
'find' => $record->away,
])
<div class="w-6 flex-none mx-auto my-auto">
@if ($record->group_cc)
<x-icon name="flag-country-{{ $record->group_cc }}" class="h5 w-5" />
@endif
</div>
</li> </li>
resources/views/filament/tables/columns/parts/move-botton.blade.php
+1 -1
View File
@@ -1,3 +1,3 @@
<div class="my-auto"> <div class="my-auto">
<x-filament::button icon="phosphor-arrows-out" outlined size="xs" /> <x-filament::button icon="phosphor-arrows-out" color="gray" size="xs" />
</div> </div>
resources/views/filament/tables/columns/parts/search-button-left.blade.php
-3
View File
@@ -1,3 +0,0 @@
<div class="my-auto">
<x-filament::button icon="phosphor-magnifying-glass" size="xs" x-on:click="search_right='{{ $find }}';" />
</div>
resources/views/filament/tables/columns/parts/search-button-right.blade.php
-3
View File
@@ -1,3 +0,0 @@
<div class="my-auto">
<x-filament::button icon="phosphor-magnifying-glass" size="xs" x-on:click="search_left='{{ $find }}'; " />
</div>
resources/views/livewire/confirm-mapping.blade.php
+14 -6
View File
@@ -1,6 +1,8 @@
@php @php
use Illuminate\Support\Carbon; use Illuminate\Support\Carbon;
dd($event, $mapper);
$e = Carbon::parse($event->starttime); $e = Carbon::parse($event->starttime);
$m = Carbon::parse($mapper->starttime); $m = Carbon::parse($mapper->starttime);
@@ -15,21 +17,27 @@
<div></div> <div></div>
<div>Startime Difference</div> <div>Startime Difference</div>
<div></div> <div></div>
<div class="bg-gray-100 dark:bg-gray-700 p-1 border dark:border-gray-800 rounded-lg">{{ $e->format('d-m-y H:i') }}</div> <div class="bg-gray-100 dark:bg-gray-700 p-1 border dark:border-gray-800 rounded-lg">
{{ $e->format('d-m-y H:i') }}</div>
@if ($seconds == 0) @if ($seconds == 0)
<div class="bg-green-100 text-green-500 p-1 border rounded-lg flex justify-center gap-1"> <div class="bg-green-100 text-green-500 p-1 border rounded-lg flex justify-center gap-1">
<span>Matching</span> <span>Matching</span>
<x-phosphor-smiley class="w-5 h-5" /> <x-phosphor-smiley class="w-5 h-5" />
</div> </div>
@elseif ($seconds < 1800 && $seconds > -1800) @elseif ($seconds < 1800 && $seconds > -1800)
<div class="bg-blue-100 dark:bg-blue-300 text-blue-500 dark:text-blue-600 <div
p-1 border rounded-lg">{{ $text }}</div> class="bg-blue-100 dark:bg-blue-300 text-blue-500 dark:text-blue-600
p-1 border rounded-lg">
{{ $text }}</div>
@elseif ($seconds < 7200 && $seconds > -7200) @elseif ($seconds < 7200 && $seconds > -7200)
<div class="bg-amber-100 dark:bg-amber-300 text-amber-500 dark:text-amber-600 p-1 border rounded-lg">{{ $text }}</div> <div class="bg-amber-100 dark:bg-amber-300 text-amber-500 dark:text-amber-600 p-1 border rounded-lg">
{{ $text }}</div>
@else @else
<div class="bg-red-100 dark:bg-red-300 text-red-500 dark:text-red-600 p-1 border rounded-lg">{{ $text }}</div> <div class="bg-red-100 dark:bg-red-300 text-red-500 dark:text-red-600 p-1 border rounded-lg">
{{ $text }}</div>
@endif @endif
<div class="bg-gray-100 dark:bg-gray-700 p-1 border dark:border-gray-800 rounded-lg">{{ $m->format('d-m-y H:i') }}</div> <div class="bg-gray-100 dark:bg-gray-700 p-1 border dark:border-gray-800 rounded-lg">
{{ $m->format('d-m-y H:i') }}</div>
<div class="col-span-3 flex justify-center gap-2 mt-6"> <div class="col-span-3 flex justify-center gap-2 mt-6">
<div> <div>
@if ($event->country?->iso2) @if ($event->country?->iso2)
resources/views/livewire/top-menu-items.blade.php
+5 -3
View File
@@ -62,7 +62,7 @@
{{-- Event Mapper --}} {{-- Event Mapper --}}
<x-filament::modal width="7xl" :close-by-clicking-away="true" :close-by-escaping="true" :close-button="true"> <x-filament::modal width="screen" :close-by-clicking-away="true" :close-by-escaping="true" :close-button="true">
<x-slot name="trigger"> <x-slot name="trigger">
<x-filament::icon-button outlined icon="phosphor-arrows-in-line-horizontal" color="gray" <x-filament::icon-button outlined icon="phosphor-arrows-in-line-horizontal" color="gray"
class="my-auto" title="Event Mapper"> class="my-auto" title="Event Mapper">
@@ -178,7 +178,8 @@
{{-- Alarm --}} {{-- Alarm --}}
<x-filament::modal slide-over width="4xl" icon="phosphor-siren" :close-by-clicking-away="true" :close-by-escaping="true" :close-button="true"> <x-filament::modal slide-over width="4xl" icon="phosphor-siren" :close-by-clicking-away="true" :close-by-escaping="true"
:close-button="true">
<x-slot name="trigger"> <x-slot name="trigger">
<x-filament::icon-button outlined icon="phosphor-siren" color="gray" class="my-auto" <x-filament::icon-button outlined icon="phosphor-siren" color="gray" class="my-auto"
title="Alarm Settings"> title="Alarm Settings">
@@ -194,7 +195,8 @@
{{-- Calculation --}} {{-- Calculation --}}
<x-filament::modal slide-over width="4xl" icon="phosphor-sliders" title="Comparing Bookmaker" :close-by-clicking-away="true" :close-by-escaping="true" :close-button="true"> <x-filament::modal slide-over width="4xl" icon="phosphor-sliders" title="Comparing Bookmaker"
:close-by-clicking-away="true" :close-by-escaping="true" :close-button="true">
<x-slot name="trigger"> <x-slot name="trigger">
<x-filament::icon-button icon="phosphor-sliders" color="gray" class="my-auto" wire:click="setUser" <x-filament::icon-button icon="phosphor-sliders" color="gray" class="my-auto" wire:click="setUser"
title="Comparing Bookmaker"> title="Comparing Bookmaker">