From f4be75e11680ce05285b102e004cfc6a162be53a Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Mon, 9 Dec 2019 22:16:07 -0600 Subject: [PATCH] mining ledger --- .../Moons/MoonLedgerController.php | 18 +++++++++++-- app/Library/Lookups/NewLookupHelper.php | 5 ++-- .../moons/ledger/displayledger.blade.php | 26 ++++++++++++++++++- 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Moons/MoonLedgerController.php b/app/Http/Controllers/Moons/MoonLedgerController.php index 60513377b..37548b171 100644 --- a/app/Http/Controllers/Moons/MoonLedgerController.php +++ b/app/Http/Controllers/Moons/MoonLedgerController.php @@ -91,6 +91,7 @@ class MoonLedgerController extends Controller //Declare variables $esiHelper = new Esi; $lookup = new NewLookupHelper; + $mining = array(); //Check for the esi scope if(!$esiHelper->HaveEsiScope(auth()->user()->getId(), 'esi-industry.read_corporation_mining.v1')) { @@ -106,7 +107,7 @@ class MoonLedgerController extends Controller //Try to get the mining ledger for the corporation observer try { - $ledger = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/{observer_id}/', [ + $ledgers = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/{observer_id}/', [ 'corporation_id' => $character->corporation_id, 'observer_id' => $request->structure, ]); @@ -114,6 +115,19 @@ class MoonLedgerController extends Controller return redirect('/dashboard')->with('error', 'Failed to get the mining ledger.'); } - + foreach($ledgers as $ledger) { + $char = $lookup->CharacterIdToName($ledger->character_id); + $ore = $lookup->ItemIdToName($ledger->type_id); + + $temp = [ + 'character' => $char, + 'ore' => $ore, + 'quantity' => $quantity, + ]; + + array_push($mining, $temp); + } + + return view('moons.ledger.displayledger')->with('mining', $mining); } } diff --git a/app/Library/Lookups/NewLookupHelper.php b/app/Library/Lookups/NewLookupHelper.php index 77f138163..fcaf2e79a 100644 --- a/app/Library/Lookups/NewLookupHelper.php +++ b/app/Library/Lookups/NewLookupHelper.php @@ -36,11 +36,12 @@ class NewLookupHelper { //Check if the item is stored in our own database first $item = $this->LookupItem($itemId); + //If the item is found, return it, otherwise, do some esi to find it. if($item != null) { return $item->name; } else { try { - $response = $this->esi->('get', '/universe/types/{type_id}/', [ + $response = $this->esi->invoke('get', '/universe/types/{type_id}/', [ 'type_id' => $itemId, ]); } catch(RequestFailedException $e) { @@ -79,7 +80,7 @@ class NewLookupHelper { if(isset($item->icon_id)) { $newItem->icon_id = $item->icon_id; } - if(isset($item->market_group_id) { + if(isset($item->market_group_id)) { $newItem->market_group_id = $item->market_group_id; } if(isset($item->mass)) { diff --git a/resources/views/moons/ledger/displayledger.blade.php b/resources/views/moons/ledger/displayledger.blade.php index 7cf47edd1..ff913d8fe 100644 --- a/resources/views/moons/ledger/displayledger.blade.php +++ b/resources/views/moons/ledger/displayledger.blade.php @@ -1,4 +1,28 @@ @extends('layouts.b4') @section('content') - +
+
+
+

Moon Ledger

+
+
+ + + + + + + + @foreach($mining as $min) + + + + + + @endforeach + +
CharacterOre NameQuantity
{{ $min['character'] }}{{ $min['ore'] }}{{ $min['quantity'] }}
+
+
+
@endsection \ No newline at end of file