diff --git a/app/Console/Commands/Grap.php b/app/Console/Commands/Grap.php index 1761092e..9331ac4e 100644 --- a/app/Console/Commands/Grap.php +++ b/app/Console/Commands/Grap.php @@ -86,7 +86,7 @@ class Grap extends Command // RANGE SetStorage::set(3); - // Grapper::load(3); + Grapper::load(3); MakeExcel::create(); diff --git a/app/Console/Commands/Grapper/Sofascore/Helper/SetStorage.php b/app/Console/Commands/Grapper/Sofascore/Helper/SetStorage.php index 88f2c66d..c9b03082 100644 --- a/app/Console/Commands/Grapper/Sofascore/Helper/SetStorage.php +++ b/app/Console/Commands/Grapper/Sofascore/Helper/SetStorage.php @@ -39,7 +39,7 @@ class SetStorage case 3: Grap::$storage = $sofascore_data . 'range/' . $storage_name; Grap::$folder = $storage_name; - Grap::$excel = $sofascore_data . 'range/' . $storage_name . '.xlsx'; + Grap::$excel = $sofascore_data . 'range/' . $storage_name; break; case 4: Grap::$storage = $sofascore_data . $storage_name; diff --git a/app/Console/Commands/Grapper/Sofascore/MakeExcel.php b/app/Console/Commands/Grapper/Sofascore/MakeExcel.php index b6a7d5b2..37e45afb 100644 --- a/app/Console/Commands/Grapper/Sofascore/MakeExcel.php +++ b/app/Console/Commands/Grapper/Sofascore/MakeExcel.php @@ -47,7 +47,7 @@ class MakeExcel } $spreadsheet = new Spreadsheet; - $spreadsheet->getProperties()->setTitle(Grap::$excel); + $spreadsheet->getProperties()->setTitle(Grap::$excel . '_' . $from . '-' . $to); $activeWorksheet = $spreadsheet->getActiveSheet(); $column = 1; @@ -69,7 +69,7 @@ class MakeExcel $spreadsheet->setActiveSheetIndex(0); $writer = IOFactory::createWriter($spreadsheet, 'Xlsx'); - $writer->save(Grap::$excel); + $writer->save(Grap::$excel . '_' . $from . '-' . $to . '.xlsx'); } } } diff --git a/app/Filament/Clusters/StaticData/Resources/StatistikoDetails/Pages/ListStatistikoDetails.php b/app/Filament/Clusters/StaticData/Resources/StatistikoDetails/Pages/ListStatistikoDetails.php index d2c16693..d79df68f 100644 --- a/app/Filament/Clusters/StaticData/Resources/StatistikoDetails/Pages/ListStatistikoDetails.php +++ b/app/Filament/Clusters/StaticData/Resources/StatistikoDetails/Pages/ListStatistikoDetails.php @@ -21,6 +21,7 @@ class ListStatistikoDetails extends ListRecords ExportAction::make('download_all') ->columnMapping(false) ->exporter(DetailsExporter::class) + ->chunkSize(1000) ->label('Download') ->fileName(fn(Export $export): string => 'details-' . date('d.m.Y-H.i') . "-{$export->getKey()}") ->icon('phosphor-download'), diff --git a/app/Models/StatistikoPlayer.php b/app/Models/StatistikoPlayer.php index e1e2da0e..4bc5316b 100644 --- a/app/Models/StatistikoPlayer.php +++ b/app/Models/StatistikoPlayer.php @@ -69,8 +69,15 @@ class StatistikoPlayer extends Model 'type_event_during_the_match', 'description_event_during_the_match', 'subtype_event_during_the_match', + 'card_yellow', + 'card_yellowred', + 'card_red', + 'ingamepenalty_missed', + 'penaltyshoutout_scored', + 'penaltyshoutout_missed', 'player_position', 'playerrating_value', + 'tm_player_id', ]; public function event() diff --git a/example2.json b/example2.json index 2f6e877a..f9de9d85 100644 --- a/example2.json +++ b/example2.json @@ -1,241 +1,43 @@ { - "uniqueTournament": { - "name": "Premier League", - "slug": "premier-league", - "primaryColorHex": "#3c1c5a", - "secondaryColorHex": "#f80158", - "logo": { "md5": "a282e49dbb721f162ebfd662abc65480", "id": 1418035 }, - "darkLogo": { "md5": "b7fdad4b5b79f120b55c43e5ac961983", "id": 294210 }, - "category": { - "name": "England", - "slug": "england", - "sport": { "name": "Football", "slug": "football", "id": 1 }, - "priority": 10, - "country": { "alpha2": "EN", "name": "England" }, - "id": 1, - "flag": "england", - "alpha2": "EN", - "fieldTranslations": { - "nameTranslation": { - "ar": "\u0625\u0646\u062c\u0644\u062a\u0631\u0627", - "hi": "\u0907\u0902\u0917\u094d\u0932\u0948\u0902\u0921", - "bn": "\u0987\u0982\u09b2\u09cd\u09af\u09be\u09a8\u09cd\u09a1", - "ru": "\u0410\u043d\u0433\u043b\u0438\u044f" + "markets": [ + { + "structureType": 1, + "marketId": 1, + "marketName": "Full time", + "isLive": false, + "fid": 162535936, + "suspended": false, + "id": 86834697, + "marketGroup": "1X2", + "marketPeriod": "Full-time", + "choices": [ + { + "initialFractionalValue": "2/1", + "fractionalValue": "2/1", + "sourceId": 1335701246, + "name": "1", + "winning": true, + "change": 0 }, - "shortNameTranslation": {} - } - }, - "userCount": 1260987, - "tier": 1, - "titleHolder": { - "name": "Arsenal", - "slug": "arsenal", - "shortName": "Arsenal", - "gender": "M", - "sport": { "name": "Football", "slug": "football", "id": 1 }, - "userCount": 3904315, - "nameCode": "ARS", - "disabled": false, - "national": false, - "type": 0, - "country": { "alpha2": "EN", "name": "England" }, - "id": 42, - "teamColors": { - "primary": "#cc0000", - "secondary": "#ffffff", - "text": "#ffffff" - }, - "fieldTranslations": { - "nameTranslation": { - "ar": "\u0627\u0631\u0633\u0646\u0627\u0644", - "bn": "\u0986\u09b0\u09cd\u09b8\u09c7\u09a8\u09be\u09b2", - "hi": "\u0906\u0930\u094d\u0938\u0947\u0928\u0932", - "ru": "\u0410\u0440\u0441\u0435\u043d\u0430\u043b" + { + "initialFractionalValue": "11/5", + "fractionalValue": "11/5", + "sourceId": 1335701247, + "name": "X", + "winning": false, + "change": 0 }, - "shortNameTranslation": {} - } - }, - "titleHolderTitles": 14, - "mostTitles": 20, - "linkedUniqueTournaments": [], - "hasRounds": true, - "hasGroups": false, - "hasPlayoffSeries": false, - "upperDivisions": [], - "lowerDivisions": [ - { - "name": "Championship", - "slug": "championship", - "primaryColorHex": "#20429a", - "secondaryColorHex": "#ac944a", - "logo": { - "md5": "25e2ced9104ace1fe1a929d12e56da19", - "id": 294000 - }, - "category": { - "name": "England", - "slug": "england", - "sport": { - "name": "Football", - "slug": "football", - "id": 1 - }, - "priority": 10, - "country": { "alpha2": "EN", "name": "England" }, - "id": 1, - "flag": "england", - "alpha2": "EN", - "fieldTranslations": { - "nameTranslation": { - "ar": "\u0625\u0646\u062c\u0644\u062a\u0631\u0627", - "hi": "\u0907\u0902\u0917\u094d\u0932\u0948\u0902\u0921", - "bn": "\u0987\u0982\u09b2\u09cd\u09af\u09be\u09a8\u09cd\u09a1", - "ru": "\u0410\u043d\u0433\u043b\u0438\u044f" - }, - "shortNameTranslation": {} - } - }, - "tier": 2, - "hasRounds": true, - "hasGroups": false, - "hasPlayoffSeries": false, - "hasPerformanceGraphFeature": true, - "periodLength": {}, - "gender": "M", - "excludeFromCareerStats": false, - "country": {}, - "id": 18, - "startDateTimestamp": 1786665600, - "endDateTimestamp": 1811548800, - "mostTitlesTeams": [ - { - "name": "Leicester City", - "slug": "leicester-city", - "shortName": "Leicester", - "gender": "M", - "sport": { - "name": "Football", - "slug": "football", - "id": 1 - }, - "userCount": 326673, - "nameCode": "LEI", - "disabled": false, - "national": false, - "type": 0, - "country": { "alpha2": "EN", "name": "England" }, - "id": 31, - "teamColors": { - "primary": "#003090", - "secondary": "#ffffff", - "text": "#ffffff" - }, - "fieldTranslations": { - "nameTranslation": { - "ar": "\u0644\u064a\u0633\u062a\u0631 \u0633\u064a\u062a\u064a", - "hi": "\u0932\u0948\u0938\u094d\u091f\u0930 \u0938\u093f\u091f\u0940 \u090d\u095e\u0938\u0940", - "ru": "\u041b\u0435\u0441\u0442\u0435\u0440 \u0421\u0438\u0442\u0438" - }, - "shortNameTranslation": { - "ar": "\u0644\u064a\u0633\u062a\u0631", - "bn": "\u09b2\u09c7\u09b8\u09cd\u099f\u09be\u09b0", - "hi": "\u0932\u0940\u0938\u0947\u0938\u094d\u091f\u0930" - } - } - } - ], - "disabledHomeAwayStandings": false, - "displayInverseHomeAwayTeams": false, - "fieldTranslations": { - "nameTranslation": { - "bn": "\u099a\u09cd\u09af\u09be\u09ae\u09cd\u09aa\u09bf\u09af\u09bc\u09a8\u09b6\u09bf\u09aa", - "hi": "\u091a\u0948\u0902\u092a\u093f\u092f\u0928\u0936\u093f\u092a", - "ar": "\u062f\u0648\u0631\u064a \u0627\u0644\u0628\u0637\u0648\u0644\u0629 \u0627\u0644\u0625\u0646\u062c\u0644\u064a\u0632\u064a\u0629", - "ru": "\u0427\u0435\u043c\u043f\u0438\u043e\u043d\u0430\u0442" - }, - "shortNameTranslation": {} + { + "initialFractionalValue": "11/10", + "fractionalValue": "11/10", + "sourceId": 1335701248, + "name": "2", + "winning": false, + "change": 0 } - } - ], - "hasPerformanceGraphFeature": true, - "periodLength": {}, - "gender": "M", - "excludeFromCareerStats": false, - "country": {}, - "id": 17, - "startDateTimestamp": 1787270400, - "endDateTimestamp": 1811635200, - "mostTitlesTeams": [ - { - "name": "Manchester United", - "slug": "manchester-united", - "shortName": "Man Utd", - "gender": "M", - "sport": { "name": "Football", "slug": "football", "id": 1 }, - "userCount": 3963614, - "nameCode": "MUN", - "disabled": false, - "national": false, - "type": 0, - "country": { "alpha2": "EN", "name": "England" }, - "id": 35, - "teamColors": { - "primary": "#ff0000", - "secondary": "#373737", - "text": "#373737" - }, - "fieldTranslations": { - "nameTranslation": { - "ar": "\u0645\u0627\u0646\u062a\u0634\u0633\u062a\u0631 \u064a\u0648\u0646\u0627\u064a\u062a\u062f", - "hi": "\u092e\u0947\u0928\u091a\u0947\u0938\u094d\u091f\u0930 \u092f\u0942\u0928\u093e\u0907\u091f\u0947\u0921 \u090d\u095e\u0938\u0940", - "ru": "\u041c\u0430\u043d\u0447\u0435\u0441\u0442\u0435\u0440 \u042e\u043d\u0430\u0439\u0442\u0435\u0434" - }, - "shortNameTranslation": { - "ar": "\u0645\u0627\u0646 \u064a\u0648\u0646\u0627\u064a\u062a\u062f", - "bn": "\u09ae\u09cd\u09af\u09be\u09a8 \u0987\u0989\u09a8\u09be\u0987\u099f\u09c7\u09a1", - "hi": "\u092e\u0948\u0928 \u092f\u0942\u0928\u093e\u0907\u091f\u0947\u0921" - } - } - }, - { - "name": "Liverpool FC", - "slug": "liverpool", - "shortName": "Liverpool", - "gender": "M", - "sport": { "name": "Football", "slug": "football", "id": 1 }, - "userCount": 4075904, - "nameCode": "LIV", - "disabled": false, - "national": false, - "type": 0, - "country": { "alpha2": "EN", "name": "England" }, - "id": 44, - "teamColors": { - "primary": "#cc0000", - "secondary": "#ffffff", - "text": "#ffffff" - }, - "fieldTranslations": { - "nameTranslation": { - "ar": "\u0644\u064a\u0641\u0631\u0628\u0648\u0644", - "bn": "\u09b2\u09bf\u09ad\u09be\u09b0\u09aa\u09c1\u09b2", - "hi": "\u0932\u093f\u0935\u0930\u092a\u0942\u0932", - "ru": "\u041b\u0438\u0432\u0435\u0440\u043f\u0443\u043b\u044c" - }, - "shortNameTranslation": {} - } - } - ], - "disabledHomeAwayStandings": false, - "displayInverseHomeAwayTeams": false, - "fieldTranslations": { - "nameTranslation": { - "ar": "\u0627\u0644\u062f\u0648\u0631\u064a \u0627\u0644\u0625\u0646\u062c\u0644\u064a\u0632\u064a \u0627\u0644\u0645\u0645\u062a\u0627\u0632", - "hi": "\u092a\u094d\u0930\u093f\u092e\u093f\u092f\u0930 \u0932\u0940\u0917", - "bn": "\u09aa\u09cd\u09b0\u09bf\u09ae\u09bf\u09df\u09be\u09b0 \u09b2\u09c0\u0997", - "ru": "\u041f\u0440\u0435\u043c\u044c\u0435\u0440-\u043b\u0438\u0433\u0430" - }, - "shortNameTranslation": {} + ] } - } + ], + "eventId": 12451223, + "liveStreamUrl": null }