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

wip

Browse Source
This commit is contained in:
salam committed 2026-07-27 11:01:55 +02:00
1 parent 087b0a2a1a
commit 90b1dfdc4f
6 files changed
+54 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/Actions/LoadStatisticFixturesLeaguesOptions.php
+2 -2
View File
@@ -7,7 +7,7 @@ use App\Models\StatisticFixtures;
class LoadStatisticFixturesLeaguesOptions class LoadStatisticFixturesLeaguesOptions
{ {
public static function load($sport_id) public static function load(int $sport_id)
{ {
$res = StatisticFixtures::where('sport_id', $sport_id) $res = StatisticFixtures::where('sport_id', $sport_id)
->groupBy('league_id') ->groupBy('league_id')
@@ -16,7 +16,7 @@ class LoadStatisticFixturesLeaguesOptions
$cnt = CompetitionGroup::with('country')->whereIn('id', $res)->get(); $cnt = CompetitionGroup::with('country')->whereIn('id', $res)->get();
$arr = []; $arr = [];
foreach ($cnt as $val) { foreach ($cnt as $val) {
$arr[$val->id] = $val->country->name.' '.$val->name; $arr[$val->id] = $val->country->name . ' ' . $val->name;
} }
asort($arr); asort($arr);
app/Actions/LoadStatisticFixturesMatchOptions.php
+2 -2
View File
@@ -6,7 +6,7 @@ use App\Models\StatisticFixtures;
class LoadStatisticFixturesMatchOptions class LoadStatisticFixturesMatchOptions
{ {
public static function load($league_id) public static function load(int $league_id)
{ {
if (! $league_id) { if (! $league_id) {
return []; return [];
@@ -15,7 +15,7 @@ class LoadStatisticFixturesMatchOptions
$arr = []; $arr = [];
foreach ($res as $val) { foreach ($res as $val) {
$arr[$val->id] = $val->starttime->format('Y-m-H H:i') . ' - ' . $val->home->name . ' vs ' . $val->away->name; $arr[$val->id] = $val->starttime->format('Y-m-d H:i') . ' - ' . $val->home->name . ' vs ' . $val->away->name;
} }
return $arr; return $arr;
app/Console/Commands/Grapper/Sofascore/Rose.php
+3 -1
View File
@@ -33,7 +33,9 @@ class Rose
} }
} }
$res = SofaScoreRosa::where('id', '>', 441)->get(); // $res = SofaScoreRosa::where('id', '>', 441)->get();
$res = SofaScoreRosa::get();
foreach ($res as $value) { foreach ($res as $value) {
app/Filament/Imports/Helper/ImportEvents.php
+8 -2
View File
@@ -25,7 +25,13 @@ class ImportEvents
* must be != null * must be != null
* exp_home, exp_away, exp_handicap, exp_total * exp_home, exp_away, exp_handicap, exp_total
*/ */
if ((float) $row[21] != 0 && (float) $row[22] != 0 && (float) $row[23] != 0) { if (
(float) $row[21] != 0
&& (float) $row[22] != 0
&& (float) $row[23] != 0
&& (float) $row[24] != 0
&& (string) $row[25] != ''
) {
StatistikoEvent::updateOrCreate( StatistikoEvent::updateOrCreate(
[ [
@@ -56,7 +62,7 @@ class ImportEvents
'exp_away' => (float) $row[22], 'exp_away' => (float) $row[22],
'exp_handicap' => (float) $row[23], 'exp_handicap' => (float) $row[23],
'exp_total' => (float) $row[24], 'exp_total' => (float) $row[24],
'result_code' => $row[25], // w, d, l 'result_code' => (string) $row[25], // w, d, l
'created_at' => $now, 'created_at' => $now,
'updated_at' => $now, 'updated_at' => $now,
] ]
app/Filament/Widgets/Data/LoadEvents.php
+15 -7
View File
@@ -8,6 +8,7 @@ use App\Models\StatistikoDetail;
use App\Models\StatistikoEvent; use App\Models\StatistikoEvent;
use App\Models\StatistikoPlayer; use App\Models\StatistikoPlayer;
use Illuminate\Support\Carbon; use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Log;
class LoadEvents class LoadEvents
{ {
@@ -115,10 +116,10 @@ class LoadEvents
->whereIn('match_id', $matches_season) ->whereIn('match_id', $matches_season)
->where('tm_player_id', '=', (int) $tm_player_id) ->where('tm_player_id', '=', (int) $tm_player_id)
->when($player_on_field, function ($query) use ($player_on_field) { ->when($player_on_field, function ($query) use ($player_on_field) {
// 'all' => 'All', // 'all' => 'All',
// 'lineup' => 'Lineup', // 'lineup' => 'Lineup',
// 'substituted' => 'Substituted', // 'substituted' => 'Substituted',
// 'notplayed' => 'Not Played', // 'notplayed' => 'Not Played',
switch ($player_on_field) { switch ($player_on_field) {
case 'all': case 'all':
return $query->where('minutes_played', '>', 0); return $query->where('minutes_played', '>', 0);
@@ -164,9 +165,9 @@ class LoadEvents
} }
} }
})->when($matches_played, function ($query) use ($matches_played, $player_on_field) { })->when($matches_played, function ($query) use ($matches_played, $player_on_field) {
if($player_on_field == 'notplayed'){ if ($player_on_field == 'notplayed') {
return $query->whereNotIn('match_id', $matches_played); return $query->whereNotIn('match_id', $matches_played);
}else { } else {
return $query->whereIn('match_id', $matches_played); return $query->whereIn('match_id', $matches_played);
} }
})->when($handicap_range, function ($query) use ($handicap_range) { })->when($handicap_range, function ($query) use ($handicap_range) {
@@ -177,7 +178,7 @@ class LoadEvents
return $query->where('starttime', '>=', $start); return $query->where('starttime', '>=', $start);
})->when($end, function ($query) use ($end) { })->when($end, function ($query) use ($end) {
return $query->where('starttime', '<=', $end); return $query->where('starttime', '<=', $end);
})->when($season , function ($query) use ($season) { })->when($season, function ($query) use ($season) {
return $query->whereIn('season', $season); return $query->whereIn('season', $season);
}) })
->orderBy('starttime', 'ASC') ->orderBy('starttime', 'ASC')
@@ -187,6 +188,9 @@ class LoadEvents
return []; return [];
} }
// Log::debug($res->toArray());
$dataset_home = []; $dataset_home = [];
$dataset_away = []; $dataset_away = [];
$dataset_exp_home = []; $dataset_exp_home = [];
@@ -201,6 +205,10 @@ class LoadEvents
// dd($value); // dd($value);
// $result_code = (string) $value['result_code'];
// Log::debug($result_code);
$labels[] = round($value['starttime']->diffInDays(Carbon::now())); $labels[] = round($value['starttime']->diffInDays(Carbon::now()));
$playing_date[] = $value['starttime']->format('d. F Y H:i'); $playing_date[] = $value['starttime']->format('d. F Y H:i');
app/Filament/Widgets/StatsMedianAverage.php
+24 -23
View File
@@ -9,7 +9,7 @@ use App\Utilities\Round;
use Filament\Widgets\Concerns\InteractsWithPageFilters; use Filament\Widgets\Concerns\InteractsWithPageFilters;
use Filament\Widgets\StatsOverviewWidget; use Filament\Widgets\StatsOverviewWidget;
use Filament\Widgets\StatsOverviewWidget\Stat; use Filament\Widgets\StatsOverviewWidget\Stat;
// use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use Illuminate\Support\HtmlString; use Illuminate\Support\HtmlString;
use Livewire\Attributes\Reactive; use Livewire\Attributes\Reactive;
@@ -80,6 +80,7 @@ class StatsMedianAverage extends StatsOverviewWidget
} }
if (isset($data['results'])) { if (isset($data['results'])) {
// Log::debug($data['results']);
$win = $data['results']['w'] ? number_format(Round::odd($total_home / $data['results']['w']), 2) : 0; $win = $data['results']['w'] ? number_format(Round::odd($total_home / $data['results']['w']), 2) : 0;
$draw = $data['results']['d'] ? number_format(Round::odd($total_home / $data['results']['d']), 2) : 0; $draw = $data['results']['d'] ? number_format(Round::odd($total_home / $data['results']['d']), 2) : 0;
$lost = $data['results']['l'] ? number_format(Round::odd($total_home / $data['results']['l']), 2) : 0; $lost = $data['results']['l'] ? number_format(Round::odd($total_home / $data['results']['l']), 2) : 0;
@@ -119,22 +120,22 @@ class StatsMedianAverage extends StatsOverviewWidget
$boxes = []; $boxes = [];
// BOX 1 // BOX 1
$boxes[] = Stat::make('Number', new HtmlString('<div id="number-of-events">'.$total_home.'</div>')) $boxes[] = Stat::make('Number', new HtmlString('<div id="number-of-events">' . $total_home . '</div>'))
->description('Events') ->description('Events')
->extraAttributes(['x-init' => "animate('number-of-events', $total_home, 0)"]); ->extraAttributes(['x-init' => "animate('number-of-events', $total_home, 0)"]);
// BOX 2 // BOX 2
$boxes[] = Stat::make('Average '.$statistic_type, self::template('avhome', 'avaway', $home_team, $away_team)) $boxes[] = Stat::make('Average ' . $statistic_type, self::template('avhome', 'avaway', $home_team, $away_team))
->description('Team '.$team_position) ->description('Team ' . $team_position)
->extraAttributes(['x-init' => "animate('avhome', $value_home); animate('avaway', $value_away)"]); ->extraAttributes(['x-init' => "animate('avhome', $value_home); animate('avaway', $value_away)"]);
// BOX 3 // BOX 3
$boxes[] = Stat::make('Average '.$statistic_type, self::template('av_team_home', 'av_team_away', $home_team, $away_team, $average_team_home, $average_team_away)) $boxes[] = Stat::make('Average ' . $statistic_type, self::template('av_team_home', 'av_team_away', $home_team, $away_team, $average_team_home, $average_team_away))
->description('Team Season') ->description('Team Season')
->extraAttributes(['x-init' => "animate('av_team_home', $average_team_home); animate('av_team_away', $average_team_away)"]); ->extraAttributes(['x-init' => "animate('av_team_home', $average_team_home); animate('av_team_away', $average_team_away)"]);
// BOX 4 // BOX 4
$boxes[] = Stat::make('Average '.$statistic_type, self::template('av_league_home', 'av_league_away', 'Home', 'Away', $average_league_home, $average_league_away)) $boxes[] = Stat::make('Average ' . $statistic_type, self::template('av_league_home', 'av_league_away', 'Home', 'Away', $average_league_home, $average_league_away))
->description('League Season') ->description('League Season')
->extraAttributes(['x-init' => "animate('av_league_home', $average_league_home); animate('av_league_away', $average_league_away)"]); ->extraAttributes(['x-init' => "animate('av_league_home', $average_league_home); animate('av_league_away', $average_league_away)"]);
@@ -154,35 +155,35 @@ class StatsMedianAverage extends StatsOverviewWidget
return $boxes; return $boxes;
} }
protected function templateOdds(&$data, float $win, float $draw, float $lost): HtmlString protected function templateOdds(array &$data, float $win, float $draw, float $lost): HtmlString
{ {
if ($data['similar_past_matches'] != 'none') { if ($data['similar_past_matches'] != 'none') {
$name_win = '1 ('.$data['results']['w'].')'; $name_win = '1 (' . $data['results']['w'] . ')';
$name_draw = 'X ('.$data['results']['d'].')'; $name_draw = 'X (' . $data['results']['d'] . ')';
$name_lost = '2 ('.$data['results']['l'].')'; $name_lost = '2 (' . $data['results']['l'] . ')';
} else { } else {
$name_win = 'Win ('.$data['results']['w'].')'; $name_win = 'Win (' . $data['results']['w'] . ')';
$name_draw = 'Draw ('.$data['results']['d'].')'; $name_draw = 'Draw (' . $data['results']['d'] . ')';
$name_lost = 'Lost ('.$data['results']['l'].')'; $name_lost = 'Lost (' . $data['results']['l'] . ')';
} }
return new HtmlString('<div class="grid grid-cols-3 justify-center"> return new HtmlString('<div class="grid grid-cols-3 justify-center">
<span class="text-center font-bold text-xl">'.number_format($win, 2).'</span> <span class="text-center font-bold text-xl">' . number_format($win, 2) . '</span>
<span class="text-center font-bold text-xl">'.number_format($draw, 2).'</span> <span class="text-center font-bold text-xl">' . number_format($draw, 2) . '</span>
<span class="text-center font-bold text-xl">'.number_format($lost, 2).'</span> <span class="text-center font-bold text-xl">' . number_format($lost, 2) . '</span>
<span class="text-center text-xs text-gray-500 dark:text-gray-400">'.$name_win.'</span> <span class="text-center text-xs text-gray-500 dark:text-gray-400">' . $name_win . '</span>
<span class="text-center text-xs text-gray-500 dark:text-gray-400">'.$name_draw.'</span> <span class="text-center text-xs text-gray-500 dark:text-gray-400">' . $name_draw . '</span>
<span class="text-center text-xs text-gray-500 dark:text-gray-400">'.$name_lost.'</span> <span class="text-center text-xs text-gray-500 dark:text-gray-400">' . $name_lost . '</span>
</div>'); </div>');
} }
protected function template(string $home_id, string $away_id, string $home_name, string $away_name, $val_home = 0, $val_away = 0): HtmlString protected function template(string $home_id, string $away_id, string $home_name, string $away_name, $val_home = 0, $val_away = 0): HtmlString
{ {
return new HtmlString('<div class="grid grid-cols-2 justify-center font-bold text-2xl"> return new HtmlString('<div class="grid grid-cols-2 justify-center font-bold text-2xl">
<span class="text-center" id="'.$home_id.'">'.$val_home.'</span> <span class="text-center" id="' . $home_id . '">' . $val_home . '</span>
<span class="text-center" id="'.$away_id.'">'.$val_away.'</span> <span class="text-center" id="' . $away_id . '">' . $val_away . '</span>
<span class="text-center text-xs text-gray-500 dark:text-gray-400">'.$home_name.'</span> <span class="text-center text-xs text-gray-500 dark:text-gray-400">' . $home_name . '</span>
<span class="text-center text-xs text-gray-500 dark:text-gray-400">'.$away_name.'</span> <span class="text-center text-xs text-gray-500 dark:text-gray-400">' . $away_name . '</span>
</div>'); </div>');
} }