From a885875ff93455b6a97cb8f1b517ae7678adf531 Mon Sep 17 00:00:00 2001 From: Marc Date: Sat, 18 May 2024 23:07:53 +0200 Subject: [PATCH 1/6] add implant icons --- src/resources/views/character/sheet.blade.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/resources/views/character/sheet.blade.php b/src/resources/views/character/sheet.blade.php index 2919f219e..2b0877158 100644 --- a/src/resources/views/character/sheet.blade.php +++ b/src/resources/views/character/sheet.blade.php @@ -137,6 +137,13 @@ @else Location is unknown @endif + + @if(! empty($clone->implants)) +
   + @foreach($clone->implants as $implant) + {!! img('types', 'icon', $implant, 32, ['class' => 'img-circle eve-icon small-icon'], false) !!} + @endforeach + @endif @endforeach From 46f7f0adf90284e34b8d5c863c8f28c9b4c8b523 Mon Sep 17 00:00:00 2001 From: Marc Date: Sun, 19 May 2024 10:28:26 +0200 Subject: [PATCH 2/6] add hover with id (for now) --- src/resources/views/character/sheet.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resources/views/character/sheet.blade.php b/src/resources/views/character/sheet.blade.php index 2b0877158..4e62f34f8 100644 --- a/src/resources/views/character/sheet.blade.php +++ b/src/resources/views/character/sheet.blade.php @@ -141,7 +141,7 @@ @if(! empty($clone->implants))
   @foreach($clone->implants as $implant) - {!! img('types', 'icon', $implant, 32, ['class' => 'img-circle eve-icon small-icon'], false) !!} + {!! img('types', 'icon', $implant, 32, ['class' => 'img-circle eve-icon small-icon'], false) !!} @endforeach @endif From 8f58c40d1e85b1085ccc1d3045adb808cffd0803 Mon Sep 17 00:00:00 2001 From: Marc Date: Sun, 19 May 2024 12:31:41 +0200 Subject: [PATCH 3/6] remove hover --- src/resources/views/character/sheet.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resources/views/character/sheet.blade.php b/src/resources/views/character/sheet.blade.php index 4e62f34f8..2b0877158 100644 --- a/src/resources/views/character/sheet.blade.php +++ b/src/resources/views/character/sheet.blade.php @@ -141,7 +141,7 @@ @if(! empty($clone->implants))
   @foreach($clone->implants as $implant) - {!! img('types', 'icon', $implant, 32, ['class' => 'img-circle eve-icon small-icon'], false) !!} + {!! img('types', 'icon', $implant, 32, ['class' => 'img-circle eve-icon small-icon'], false) !!} @endforeach @endif From 782ad2290dc7f5e3a26f4fd8a36fee2eb656247d Mon Sep 17 00:00:00 2001 From: Marc Date: Sun, 19 May 2024 13:04:22 +0200 Subject: [PATCH 4/6] map IDs to texts --- src/Http/Controllers/Character/SheetController.php | 12 +++++++++++- src/resources/views/character/sheet.blade.php | 6 ++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/Http/Controllers/Character/SheetController.php b/src/Http/Controllers/Character/SheetController.php index de0b4aa45..777e75c8b 100644 --- a/src/Http/Controllers/Character/SheetController.php +++ b/src/Http/Controllers/Character/SheetController.php @@ -24,6 +24,7 @@ use Seat\Eveapi\Models\Character\CharacterInfo; use Seat\Web\Http\Controllers\Controller; +use Seat\Eveapi\Models\Sde\InvType; /** * Class SheetController. @@ -38,6 +39,15 @@ class SheetController extends Controller */ public function show(CharacterInfo $character) { - return view('web::character.sheet', compact('character')); + + //create key/value pairs for implant IDs and texts + $jumpclone_implants = array(); + foreach ($character->jump_clones as $jump_clone) { + foreach($jump_clone->implants as $implant_id) { + $jumpclone_implants[$implant_id] = InvType::find($implant_id)->typeName; + } + } + + return view('web::character.sheet', compact('character', 'jumpclone_implants')); } } diff --git a/src/resources/views/character/sheet.blade.php b/src/resources/views/character/sheet.blade.php index 2b0877158..ce659fd57 100644 --- a/src/resources/views/character/sheet.blade.php +++ b/src/resources/views/character/sheet.blade.php @@ -140,8 +140,10 @@ @if(! empty($clone->implants))
   - @foreach($clone->implants as $implant) - {!! img('types', 'icon', $implant, 32, ['class' => 'img-circle eve-icon small-icon'], false) !!} + @foreach($clone->implants as $implant_id) + + {!! img('types', 'icon', $implant_id, 32, ['class' => 'img-circle eve-icon small-icon'], false) !!} + @endforeach @endif From 1d8f1ede476bab4310be3416f16a56c7073c0c00 Mon Sep 17 00:00:00 2001 From: Marc Date: Sun, 19 May 2024 13:17:34 +0200 Subject: [PATCH 5/6] Fix StyleCI issues --- src/Http/Controllers/Character/SheetController.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Http/Controllers/Character/SheetController.php b/src/Http/Controllers/Character/SheetController.php index 777e75c8b..db706edcb 100644 --- a/src/Http/Controllers/Character/SheetController.php +++ b/src/Http/Controllers/Character/SheetController.php @@ -3,7 +3,7 @@ /* * This file is part of SeAT * - * Copyright (C) 2015 to 2022 Leon Jacobs + * Copyright (C) 2015 to present Leon Jacobs * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,8 +23,8 @@ namespace Seat\Web\Http\Controllers\Character; use Seat\Eveapi\Models\Character\CharacterInfo; -use Seat\Web\Http\Controllers\Controller; use Seat\Eveapi\Models\Sde\InvType; +use Seat\Web\Http\Controllers\Controller; /** * Class SheetController. @@ -39,9 +39,8 @@ class SheetController extends Controller */ public function show(CharacterInfo $character) { - //create key/value pairs for implant IDs and texts - $jumpclone_implants = array(); + $jumpclone_implants = []; foreach ($character->jump_clones as $jump_clone) { foreach($jump_clone->implants as $implant_id) { $jumpclone_implants[$implant_id] = InvType::find($implant_id)->typeName; From 6a52cf6a6df57ea7bcc6cfa2d0fb6408f9b9fe3c Mon Sep 17 00:00:00 2001 From: Marc Date: Fri, 24 May 2024 17:17:36 +0200 Subject: [PATCH 6/6] update for fewer reads --- .../Controllers/Character/SheetController.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Http/Controllers/Character/SheetController.php b/src/Http/Controllers/Character/SheetController.php index db706edcb..be0578c85 100644 --- a/src/Http/Controllers/Character/SheetController.php +++ b/src/Http/Controllers/Character/SheetController.php @@ -40,12 +40,15 @@ class SheetController extends Controller public function show(CharacterInfo $character) { //create key/value pairs for implant IDs and texts - $jumpclone_implants = []; - foreach ($character->jump_clones as $jump_clone) { - foreach($jump_clone->implants as $implant_id) { - $jumpclone_implants[$implant_id] = InvType::find($implant_id)->typeName; - } - } + $jumpclone_implant_ids = collect($character->jump_clones) + ->pluck('implants') + ->flatten() + ->unique(); + + $jumpclone_implants = InvType::whereIn('typeID', $jumpclone_implant_ids) + ->get() + ->pluck('typeName', 'typeID') + ->toArray(); return view('web::character.sheet', compact('character', 'jumpclone_implants')); }