From 10f74c4dc4032f39ff2646493b466e4d6cbdc810 Mon Sep 17 00:00:00 2001 From: "Anthony M. Powers" Date: Wed, 12 Jan 2022 00:25:12 -0800 Subject: [PATCH 1/6] feat: add corporate_reward_payout (#597) --- src/Traits/Stats.php | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/Traits/Stats.php b/src/Traits/Stats.php index 381fdd76c..2dc5e2d66 100644 --- a/src/Traits/Stats.php +++ b/src/Traits/Stats.php @@ -71,7 +71,7 @@ public function getTotalCharacterMiningIsk(array $character_ids): ?float public function getTotalCharacterRattingIsk(array $character_ids): ?float { return CharacterWalletJournal::whereIn('second_party_id', $character_ids) - ->whereIn('ref_type', ['bounty_prizes', 'ess_escrow_transfer']) + ->whereIn('ref_type', ['bounty_prizes', 'ess_escrow_transfer', 'corporate_reward_payout']) ->whereYear('date', carbon()->year) ->whereMonth('date', carbon()->month) ->sum('amount'); @@ -125,9 +125,11 @@ public function getCharacterSkillCoverage(int $character_id): Collection $in_game_skills = DB::table('invTypes') ->join( 'invMarketGroups', - 'invMarketGroups.marketGroupID', '=', 'invTypes.marketGroupID' + 'invMarketGroups.marketGroupID', + '=', + 'invTypes.marketGroupID' ) - ->where('parentGroupID', '?')// binding at [1] + ->where('parentGroupID', '?') // binding at [1] ->select( 'marketGroupName', DB::raw('COUNT(*) * 5 as amount') @@ -137,15 +139,17 @@ public function getCharacterSkillCoverage(int $character_id): Collection $character_skills = CharacterSkill::join( 'invTypes', - 'invTypes.typeID', '=', + 'invTypes.typeID', + '=', 'character_skills.skill_id' ) ->join( 'invMarketGroups', - 'invMarketGroups.marketGroupID', '=', + 'invMarketGroups.marketGroupID', + '=', 'invTypes.marketGroupID' ) - ->where('character_id', '?')// binding at [2] + ->where('character_id', '?') // binding at [2] ->select( 'marketGroupName', DB::raw('COUNT(*) * character_skills.trained_skill_level as amount') @@ -167,8 +171,8 @@ public function getCharacterSkillCoverage(int $character_id): Collection DB::raw('SUM(b.amount) AS character_amount') ) ->groupBy(['a.marketGroupName', 'a.amount']) - ->addBinding(150, 'select')// binding [1] - ->addBinding($character_id, 'select')// binding [2] + ->addBinding(150, 'select') // binding [1] + ->addBinding($character_id, 'select') // binding [2] ->get(); return $skills; From 1df69df54b48575f1f4f4b0ef5c736ac3cdd7eba Mon Sep 17 00:00:00 2001 From: Crypta Electrica Date: Sun, 20 Feb 2022 11:53:53 +0000 Subject: [PATCH 2/6] fix: add check around impersonation button --- src/resources/views/includes/header.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/resources/views/includes/header.blade.php b/src/resources/views/includes/header.blade.php index 762b8e01f..0d06b191b 100644 --- a/src/resources/views/includes/header.blade.php +++ b/src/resources/views/includes/header.blade.php @@ -25,11 +25,13 @@ @endcan + @if(session('impersonation_origin', false))
+ @endif
From 833377033ed30b106c58fef8ac9d382297b71a72 Mon Sep 17 00:00:00 2001 From: Crypta Electrica Date: Sun, 20 Feb 2022 11:56:32 +0000 Subject: [PATCH 3/6] fix: s/online_layers/online_players/g --- src/resources/lang/af/seat.php | 2 +- src/resources/lang/de/seat.php | 2 +- src/resources/lang/en/seat.php | 2 +- src/resources/lang/fr/seat.php | 2 +- src/resources/lang/ru/seat.php | 2 +- src/resources/lang/zh-CN/seat.php | 2 +- src/resources/views/home.blade.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/resources/lang/af/seat.php b/src/resources/lang/af/seat.php index 8443a1e89..4c0e2040a 100644 --- a/src/resources/lang/af/seat.php +++ b/src/resources/lang/af/seat.php @@ -160,7 +160,7 @@ // Dashboard 'home_page' => 'Die Tuisblad', - 'online_layers' => 'Spelers Aanlyn', + 'online_players' => 'Spelers Aanlyn', 'owned_api_keys' => 'Besitte API Sleutels', 'concurrent_player_count' => 'Gelyktydige speler telling', 'esi_response_time' => 'ESI Response Times', diff --git a/src/resources/lang/de/seat.php b/src/resources/lang/de/seat.php index 81deec3f2..613d9f12c 100644 --- a/src/resources/lang/de/seat.php +++ b/src/resources/lang/de/seat.php @@ -165,7 +165,7 @@ // Dashboard 'home_page' => 'Home', - 'online_layers' => 'Spieler Online', + 'online_players' => 'Spieler Online', 'owned_api_keys' => 'Eigene API Keys', 'concurrent_player_count' => 'Anzahl gleichzeitiger Spieler', 'esi_response_time' => 'ESI Reaktionszeiten', diff --git a/src/resources/lang/en/seat.php b/src/resources/lang/en/seat.php index 465053e37..e2a4247e0 100644 --- a/src/resources/lang/en/seat.php +++ b/src/resources/lang/en/seat.php @@ -225,7 +225,7 @@ // Dashboard 'home_page' => 'The Home Page', 'dashboard' => 'Dashboard', - 'online_layers' => 'Online Players', + 'online_players' => 'Online Players', 'owned_api_keys' => 'Owned API Keys', 'total_character_isk' => 'Total Character ISK', 'total_character_skillpoints' => 'Total Character Skillpoints', diff --git a/src/resources/lang/fr/seat.php b/src/resources/lang/fr/seat.php index 1c6fa17e3..415c4a6e7 100644 --- a/src/resources/lang/fr/seat.php +++ b/src/resources/lang/fr/seat.php @@ -175,7 +175,7 @@ // Dashboard 'home_page' => 'Page d\'accueil', - 'online_layers' => 'Joueurs connectés', + 'online_players' => 'Joueurs connectés', 'owned_api_keys' => 'Clés API possédées', 'concurrent_player_count' => 'Nombre de joueurs simultanés', 'esi_response_time' => 'Temps de réponse d\'ESI', diff --git a/src/resources/lang/ru/seat.php b/src/resources/lang/ru/seat.php index 5dddd52e6..cd28e0ff9 100644 --- a/src/resources/lang/ru/seat.php +++ b/src/resources/lang/ru/seat.php @@ -201,7 +201,7 @@ // Dashboard 'home_page' => 'Стартовая страница', 'dashboard' => 'Аналитика', - 'online_layers' => 'Игроки онлайн', + 'online_players' => 'Игроки онлайн', 'owned_api_keys' => 'Введеные API ключи', 'total_character_isk' => 'Итого (ISK)', 'total_character_skillpoints' => 'Итого очков умения (SP)', diff --git a/src/resources/lang/zh-CN/seat.php b/src/resources/lang/zh-CN/seat.php index f83464873..e1062f24d 100644 --- a/src/resources/lang/zh-CN/seat.php +++ b/src/resources/lang/zh-CN/seat.php @@ -198,7 +198,7 @@ // Dashboard 'home_page' => '首页', 'dashboard' => '仪表盘', - 'online_layers' => '在线玩家', + 'online_players' => '在线玩家', 'owned_api_keys' => '拥有的API数量', 'total_character_isk' => '总角色ISK', 'total_character_skillpoints' => '总角色技能点', diff --git a/src/resources/views/home.blade.php b/src/resources/views/home.blade.php index 5d290cb8a..34122af9f 100644 --- a/src/resources/views/home.blade.php +++ b/src/resources/views/home.blade.php @@ -13,7 +13,7 @@
- {{ trans('web::seat.online_layers') }} + {{ trans('web::seat.online_players') }} {{ $server_status['players'] ?? trans('web::seat.unknown') }} From 79f38b9986639d618309e503170db8b5d635d2f7 Mon Sep 17 00:00:00 2001 From: Crypta Electrica Date: Sun, 20 Feb 2022 12:49:15 +0000 Subject: [PATCH 4/6] Round Security Status in Character Overview --- src/Http/DataTables/Character/CharacterDataTable.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Http/DataTables/Character/CharacterDataTable.php b/src/Http/DataTables/Character/CharacterDataTable.php index 8014107d4..2f824e671 100644 --- a/src/Http/DataTables/Character/CharacterDataTable.php +++ b/src/Http/DataTables/Character/CharacterDataTable.php @@ -59,6 +59,9 @@ public function ajax() return ''; }) + ->editColumn('security_status', function ($row) { + return number_format($row->security_status, 2,); + }) ->editColumn('refresh_token.expires_on', function ($row) { return view('web::character.partials.token_status', ['refresh_token' => $row->refresh_token])->render(); }) From 6bfec6b3d4ff8e7d6ace9cccb1fc5609180123d1 Mon Sep 17 00:00:00 2001 From: Crypta Electrica Date: Wed, 23 Feb 2022 10:41:41 +0000 Subject: [PATCH 5/6] fix: only show corp member limit if we have it --- src/Http/DataTables/Alliance/Intel/TrackingDataTable.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Http/DataTables/Alliance/Intel/TrackingDataTable.php b/src/Http/DataTables/Alliance/Intel/TrackingDataTable.php index 33dc946a0..a7aade55e 100644 --- a/src/Http/DataTables/Alliance/Intel/TrackingDataTable.php +++ b/src/Http/DataTables/Alliance/Intel/TrackingDataTable.php @@ -49,7 +49,7 @@ public function ajax() }) ->editColumn('member_count', function ($row) { if ($row->member_limit->limit < 1) - return sprintf('%d/%d (100.00%%)', $row->member_count, $row->member_count); + return sprintf('%d', $row->member_count); return sprintf('%d/%d (%s%%)', $row->member_count, $row->member_limit->limit, number($row->member_count / $row->member_limit->limit * 100)); @@ -58,8 +58,6 @@ public function ajax() return view('web::partials.character', ['character' => $row->ceo])->render(); }) ->editColumn('tracking', function ($row) { - //
{{ $trackings }} / {{ $sheet->member_count }} ({{ number_format($trackings/$sheet->member_count * 100, 2) }}%) {{ trans_choice('web::seat.valid_token', $sheet->member_count) }}
- $trackings = $row->characters->reject(function ($char) { return is_null($char->refresh_token); })->count(); @@ -93,7 +91,9 @@ public function html() */ public function query() { - return CorporationInfo::player()->with('member_limit', 'ceo', 'alliance') + return CorporationInfo::player() + ->with('member_limit', 'ceo', 'alliance') + ->withCount('characters') ->select('corporation_infos.*'); } From 4b80a77c1a4c33fc9e79dbeb342ae508a47e2efc Mon Sep 17 00:00:00 2001 From: Crypta Electrica Date: Wed, 23 Feb 2022 21:02:26 +0000 Subject: [PATCH 6/6] remove tracking ordering from alliance tracking datatable --- src/Http/DataTables/Alliance/Intel/TrackingDataTable.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Http/DataTables/Alliance/Intel/TrackingDataTable.php b/src/Http/DataTables/Alliance/Intel/TrackingDataTable.php index a7aade55e..b2aca6d96 100644 --- a/src/Http/DataTables/Alliance/Intel/TrackingDataTable.php +++ b/src/Http/DataTables/Alliance/Intel/TrackingDataTable.php @@ -92,8 +92,7 @@ public function html() public function query() { return CorporationInfo::player() - ->with('member_limit', 'ceo', 'alliance') - ->withCount('characters') + ->with('member_limit', 'ceo', 'alliance', 'characters') ->select('corporation_infos.*'); } @@ -108,7 +107,7 @@ public function getColumns() ['data' => 'ceo.name', 'title' => trans('web::seat.ceo')], ['data' => 'tax_rate', 'title' => trans('web::seat.tax_rate')], ['data' => 'member_count', 'title' => trans('web::seat.member_count')], - ['data' => 'tracking', 'title' => trans_choice('web::seat.valid_token', 2)], + ['data' => 'tracking', 'title' => trans_choice('web::seat.valid_token', 2), 'orderable' => false], ]; } }