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

mapper new

Browse Source
This commit is contained in:
salam committed 2026-02-04 17:09:03 +01:00
1 parent 3a289dd776
commit c5118a4fd0
12 files changed
+94 -119
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/Livewire/MapperLeft.php
+11 -57
View File
@@ -19,7 +19,6 @@ 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\IconColumn;
use Filament\Tables\Columns\TextColumn; use Filament\Tables\Columns\TextColumn;
@@ -72,11 +71,6 @@ 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(''), IconColumn::make('country.icon')->icon(fn (string $state): string => $state)->label(''),
TextColumn::make('competition_group.name')->label('Group') TextColumn::make('competition_group.name')->label('Group')
->wrap() ->wrap()
@@ -88,54 +82,12 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable
$this->dispatch('refreshMapperRight'); $this->dispatch('refreshMapperRight');
} }
}), }),
TextColumn::make('home.name') TextColumn::make('starttime')
->label('Home') ->sortable()
->color('home') ->time('H:i')
->weight(FontWeight::Bold) ->alignCenter()
->alignRight(), ->description(fn ($record): string => Carbon::parse($record->starttime)->format('d. M. y')),
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') ->defaultSort('starttime')
->searchable(['home.name', 'away.name']) ->searchable(['home.name', 'away.name'])
@@ -146,7 +98,6 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable
Select::make('country_id') Select::make('country_id')
->placeholder('Country') ->placeholder('Country')
->hiddenLabel() ->hiddenLabel()
// ->multiple()
->searchable() ->searchable()
->preload() ->preload()
->options(function () { ->options(function () {
@@ -225,7 +176,7 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable
if ($this->search_left) { if ($this->search_left) {
$searchValues = preg_split('/\s+/', $this->search_left, -1, PREG_SPLIT_NO_EMPTY); $searchValues = preg_split('/\s+/', $this->search_left, -1, PREG_SPLIT_NO_EMPTY);
foreach ($searchValues as $value) { foreach ($searchValues as $value) {
$indicators[] = Indicator::make($value)->removeField($value); $indicators[] = Indicator::make($value)->removeField($value)->color('info');
} }
} }
@@ -287,12 +238,15 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable
}) })
->closeModalByEscaping(false) ->closeModalByEscaping(false)
->modalCloseButton(false) ->modalCloseButton(false)
->modalCancelAction(fn (Action $action) => $action->keyBindings(['c'])->tooltip('keyboard: "c"'))
->closeModalByClickingAway(false) ->closeModalByClickingAway(false)
->modalAlignment(Alignment::Center) ->modalAlignment(Alignment::Center)
->modalFooterActionsAlignment(Alignment::Center) ->modalFooterActionsAlignment(Alignment::Center)
->modalWidth('2xl') ->modalWidth('2xl')
->modalSubmitActionLabel('Confirm') ->modalSubmitActionLabel('Save')
->modalSubmitAction(); ->modalSubmitAction(
fn (Action $action) => $action->keyBindings(['return'])->tooltip('keyboard: "return"')
);
} }
public function render() public function render()
app/Livewire/MapperRight.php
+13 -34
View File
@@ -17,14 +17,12 @@ 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\IconColumn;
use Filament\Tables\Columns\TextColumn; 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;
@@ -72,14 +70,11 @@ 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') TextColumn::make('starttime')
->color('home') ->sortable()
->weight(FontWeight::Bold) ->time('H:i')
->alignRight(), ->alignCenter()
IconColumn::make('id')->icon('phosphor-minus')->label('')->color('black'), ->description(fn ($record): string => Carbon::parse($record->starttime)->format('d. M. y')),
TextColumn::make('away')
->color('away')
->weight(FontWeight::Bold),
TextColumn::make('group') TextColumn::make('group')
->wrap() ->wrap()
->tooltip('Click to filter by this group') ->tooltip('Click to filter by this group')
@@ -91,28 +86,7 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
} }
}), }),
IconColumn::make('group_cc')->icon(fn (string $state): string => 'flag-country-'.$state)->label(''), 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'])
->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([
@@ -223,7 +197,7 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
if ($this->search_right) { if ($this->search_right) {
$searchValues = preg_split('/\s+/', $this->search_right, -1, PREG_SPLIT_NO_EMPTY); $searchValues = preg_split('/\s+/', $this->search_right, -1, PREG_SPLIT_NO_EMPTY);
foreach ($searchValues as $value) { foreach ($searchValues as $value) {
$indicators[] = Indicator::make($value)->removeField($value); $indicators[] = Indicator::make($value)->removeField($value)->color('info');
} }
} }
@@ -273,6 +247,7 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
{ {
return Action::make('right') return Action::make('right')
->modalHeading('Event Mapper') ->modalHeading('Event Mapper')
->modalDescription('Keyboard: "enter" Save, "c" Close')
->modalContent(function (array $arguments) { ->modalContent(function (array $arguments) {
$event = Event::where('id', $arguments['id'])->first(); $event = Event::where('id', $arguments['id'])->first();
@@ -289,12 +264,16 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
}) })
->closeModalByEscaping(false) ->closeModalByEscaping(false)
->modalCloseButton(false) ->modalCloseButton(false)
->modalCancelAction(fn (Action $action) => $action->keyBindings(['c'])->tooltip('keyboard: "c"'))
->closeModalByClickingAway(false) ->closeModalByClickingAway(false)
->modalAlignment(Alignment::Center) ->modalAlignment(Alignment::Center)
->modalFooterActionsAlignment(Alignment::Center) ->modalFooterActionsAlignment(Alignment::Center)
->modalWidth('2xl') ->modalWidth('2xl')
->modalSubmitActionLabel('Confirm') ->modalSubmitActionLabel('Save')
->modalSubmitAction(); ->modalSubmitAction()
->modalSubmitAction(
fn (Action $action) => $action->keyBindings(['return'])->tooltip('keyboard: "return"')
);
} }
public function render() public function render()
app/Livewire/SportSwitcher.php
+7 -7
View File
@@ -43,19 +43,19 @@ class SportSwitcher extends Component
$this->iconcolor = Sport::where('id', $this->sport_id)->pluck('color')->first(); $this->iconcolor = Sport::where('id', $this->sport_id)->pluck('color')->first();
// $this->js('window.location.reload()');
$this->dispatch('filterClearFilter'); $this->dispatch('filterClearFilter');
$this->dispatch('refreshSportSwitcher'); $this->js('window.location.reload()');
$this->dispatch('refreshBettypeMenu'); // $this->dispatch('refreshSportSwitcher');
$this->dispatch('refreshMultilineBookmaker'); // $this->dispatch('refreshBettypeMenu');
$this->dispatch('refreshComparingBookmakerMenu'); // $this->dispatch('refreshMultilineBookmaker');
$this->dispatch('refreshAlarmBookmaker'); // $this->dispatch('refreshComparingBookmakerMenu');
// $this->dispatch('refreshAlarmBookmaker');
} }
composer.lock
Generated
+3 -3
View File
@@ -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.9.0" "plugin-api-version": "2.6.0"
} }
resources/css/filament/admin/theme.css
+6
View File
@@ -30,6 +30,12 @@ button[wire\:click="resetTableFiltersForm"] {
} }
} }
.drag-and-drop__item:active {
@apply rounded;
background-color: rgba(43, 127, 255, 0.1);
}
/* .fi-ta-header-toolbar { /* .fi-ta-header-toolbar {
@apply flex-row-reverse; @apply flex-row-reverse;
} */ } */
resources/views/filament/tables/columns/mapper-left-column.blade.php
+22 -7
View File
@@ -1,17 +1,32 @@
<li class="cursor-grab drag-and-drop__item" x-data="{ moveoverleft: false }" id={{ $record->id }} <li class="cursor-grab drag-and-drop__item p-3 flex flex-1 justify-between w-full gap-3"
id="{{ $record->id }}"
x-data="{ moveoverleft: false }"
x-on:dragstart.self=" x-on:dragstart.self="
dragging = true; dragging = true;
event.dataTransfer.effectAllowed = 'move'; event.dataTransfer.effectAllowed = 'move';
event.dataTransfer.setData('text/plain', event.target.id);" event.dataTransfer.setData('text/plain', event.target.id);"
x-on:dragover.prevent="moveoverleft = true" x-on:dragleave.prevent="moveoverleft = false" x-on:dragover.prevent="moveoverleft = true"
x-on:drop="moveoverleft = false" :class="moveoverleft ? 'bg-primary-500/20!' : ''" x-on:dragleave.prevent="moveoverleft = false"
x-on:drop="moveoverleft = false" :class="moveoverleft ? 'bg-blue-600/20! rounded':''"
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('div'); const target = event.target.closest('li');
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, mover:'left' });"
draggable="true" mapper="left"> draggable="true"
mapper="left">
<div class="flex justify-center gap-4 w-full my-calendar">
<div class="text-lime-500 text-wrap text-right">{{ $record->home->name }}</div>
<div>-</div>
<div class="text-sky-500 text-wrap">{{ $record->away->name }}</div>
</div>
@include('filament.tables.columns.parts.move-botton') <div class="grid grid-cols-3 gap-4">
@include('filament.tables.columns.parts.search-left', ['find' => $record->home->name, 'color' => 'away'])
@include('filament.tables.columns.parts.search-left', ['find' => $record->away->name, 'color' => 'home'])
@include('filament.tables.columns.parts.move-botton')
</div>
</li> </li>
resources/views/filament/tables/columns/mapper-right-column.blade.php
+22 -6
View File
@@ -1,16 +1,32 @@
<li class="cursor-grab drag-and-drop__item" x-data="{ moveoverright: false }" id={{ $record->event_id }} <li class="cursor-grab drag-and-drop__item p-3 flex flex-1 gap-3 justify-between"
id="{{ $record->event_id }}"
x-data="{ moveoverright: false }"
x-on:dragstart.self=" x-on:dragstart.self="
dragging = true; dragging = true;
event.dataTransfer.effectAllowed = 'move'; event.dataTransfer.effectAllowed = 'move';
event.dataTransfer.setData('text/plain', event.target.id);" event.dataTransfer.setData('text/plain', event.target.id);"
x-on:dragover.prevent="moveoverright = true" x-on:dragleave.prevent="moveoverright = false" x-on:dragover.prevent="moveoverright = true"
x-on:drop="moveoverright = false" :class="moveoverright ? 'bg-primary-500/20!' : ''" x-on:dragleave.prevent="moveoverright = false"
x-on:drop="moveoverright = false" :class="moveoverright ? 'bg-blue-600/20! rounded':''"
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('li');
if(document.getElementById(id).getAttribute('mapper') !=target.getAttribute('mapper')) if(document.getElementById(id).getAttribute('mapper') !=target.getAttribute('mapper'))
$wire.mountAction('right', { id: id, event_id: target.id });" $wire.mountAction('right', { id: id, event_id: target.id, mover:'right' });"
draggable="true" mapper="right"> draggable="true"
mapper="right">
@include('filament.tables.columns.parts.move-botton') <div class="grid grid-cols-3 gap-4">
@include('filament.tables.columns.parts.move-botton')
@include('filament.tables.columns.parts.search-right', ['find' => $record->away, 'color' => 'home'])
@include('filament.tables.columns.parts.search-right', ['find' => $record->home, 'color' => 'away'])
</div>
<div class="flex justify-center gap-4 w-full">
<div class="text-sky-500 text-wrap text-right">{{ $record->home }}</div>
<div>-</div>
<div class="text-lime-500 text-wrap">{{ $record->away }}</div>
</div>
</li> </li>
resources/views/filament/tables/columns/parts/move-botton.blade.php
+2 -1
View File
@@ -1,3 +1,4 @@
<div class="my-auto"> <div class="my-auto">
<x-filament::button icon="phosphor-arrows-out" color="gray" size="xs" /> {{-- <x-filament::icon-button icon="phosphor-arrows-out" size="xs" outlined/> --}}
<x-phosphor-arrows-out class="h-4" color="gray"></x-phosphor-arrows-out>
</div> </div>
resources/views/filament/tables/columns/parts/search-left.blade.php
+3
View File
@@ -0,0 +1,3 @@
<div class="my-auto">
<x-filament::icon-button icon="phosphor-magnifying-glass" color="{{ $color }}" outlined size="xs" x-on:click="search_right='{{ $find }}';" />
</div>
resources/views/filament/tables/columns/parts/search-right.blade.php
+3
View File
@@ -0,0 +1,3 @@
<div class="my-auto">
<x-filament::icon-button icon="phosphor-magnifying-glass" color="{{ $color }}" outlined size="xs" x-on:click="search_left='{{ $find }}'; " />
</div>
resources/views/livewire/confirm-mapping.blade.php
+1 -3
View File
@@ -1,8 +1,6 @@
@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);
@@ -54,7 +52,7 @@
<div class="row-span-2 text-center py-auto"> <div class="row-span-2 text-center py-auto">
<div x-data="{ elements_swopped: false, toggle() { this.elements_swopped = !this.elements_swopped } }" x-init="elements_swopped = true"> <div x-data="{ elements_swopped: false, toggle() { this.elements_swopped = !this.elements_swopped } }" x-init="elements_swopped = true">
<x-filament::button color="gray" outlined @click="toggle()" wire:click="toggle()"> <x-filament::button color="gray" outlined @click="toggle()" wire:click="toggle()" onkeydown="return event.key != 'Enter';">
<div x-show="elements_swopped"> <div x-show="elements_swopped">
<x-icon-paralell class="h-14 w-14 mx-auto" /> <x-icon-paralell class="h-14 w-14 mx-auto" />
</div> </div>
resources/views/livewire/top-menu-items.blade.php
+1 -1
View File
@@ -70,7 +70,7 @@
</x-slot> </x-slot>
<x-slot name="heading"> <x-slot name="heading">
<div class="flex justify-between items-center w-5xl"> <div class="flex justify-between items-center w-screen pr-24">
<x-sport-header> <x-sport-header>
{{ auth()->user()->sport->name }} Event Mapper {{ auth()->user()->sport->name }} Event Mapper
</x-sport-header> </x-sport-header>