drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moon displays

Browse Source
This commit is contained in:
drkthunder02
2021-05-31 23:17:57 +09:00
parent 5472c99b15
commit e777d7e816
9 changed files with 377 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

195
app/Http/Controllers/MiningTaxes/MiningTaxesController.php
View File

@@ -10,7 +10,6 @@ use Log;
use Carbon\Carbon;
use Khill\Lavacharts\Lavacharts;
use Auth;
//Collection Stuff
use Illuminate\Support\Collection;
use Illuminate\Support\Str;
@@ -19,6 +18,7 @@ use App\Library\Helpers\LookupHelper;
use App\Library\Helpers\StructureHelper;
use Seat\Eseye\Exceptions\RequestFailedException;
use App\Library\Esi\Esi;
use App\Library\Moons\MoonCalc;
//Models
use App\Models\Moon\ItemComposition;
@@ -29,6 +29,8 @@ use App\Models\MiningTax\Invoice;
use App\Models\Esi\EsiToken;
use App\Models\Esi\EsiScope;
use App\Models\User\User;
use App\Models\MoonRental\AllianceMoon;
use App\Models\MoonRental\AllianceMoonOre;
class MiningTaxesController extends Controller
{
@@ -40,6 +42,181 @@ class MiningTaxesController extends Controller
$this->middleware('role:User');
}
public function displayAvailableMoons() {
//Declare variables
$moons = new Collection;
$mHelper = new MoonCalc;
$lookup = new LookupHelper;
$system = array();
/**
* Declare our different flavors of moon goo for the blade
*/
$r4Goo = [
'Zeolites',
'Sylvite',
'Bitumens',
'Coesite',
];
$r8Goo = [
'Cobaltite',
'Euxenite',
'Titanite',
'Scheelite',
];
$r16Goo = [
'Otavite',
'Sperrylite',
'Vanadinite',
'Chromite',
];
$r32Goo = [
'Carnotite',
'Zircon',
'Pollucite',
'Cinnabar',
];
$r64Goo = [
'Xenotime',
'Monazite',
'Loparite',
'Ytterbite',
];
$systems = [
'0-NTIS',
'1-NJLK',
'35-JWD',
'8KR9-5',
'EIMJ-M',
'F-M1FU',
'G-C8QO',
'I6M-9U',
'L5D-ZL',
'L-YMYU',
'VQE-CN',
'VR-YIQ',
'XZ-SKZ',
'Y-CWQY',
];
//Get all of the moons which are not rented
$allyMoons = AllianceMoon::where([
'rented' => 'No',
])->get();
foreach($allyMoons as $moon) {
$ores = AllianceMoonOre::where([
'moon_id' => $moon->moon_id,
])->get()->toArray();
$moons->push([
'system' => $moon->system_name,
'ores' => $ores;
]);
}
return view('miningtax.user.display.moons.allmoons')->with('moons', $moons)
->with('systems', $systems);
->with('r4Goo', $r4Goo)
->with('r8Goo', $r8Goo)
->with('r16Goo', $r16Goo)
->with('r32Goo', $r32Goo)
->with('r64Goo', $r64Goo);
}
/**
* Display all the moons in Warped Intentions Sovreignty
*/
public function displayAllMoons() {
//Declare variables
$moons = new Collection;
$mHelper = new MoonCalc;
$lookup = new LookupHelper;
$system = array();
/**
* Declare our different flavors of moon goo for the blade
*/
$r4Goo = [
'Zeolites',
'Sylvite',
'Bitumens',
'Coesite',
];
$r8Goo = [
'Cobaltite',
'Euxenite',
'Titanite',
'Scheelite',
];
$r16Goo = [
'Otavite',
'Sperrylite',
'Vanadinite',
'Chromite',
];
$r32Goo = [
'Carnotite',
'Zircon',
'Pollucite',
'Cinnabar',
];
$r64Goo = [
'Xenotime',
'Monazite',
'Loparite',
'Ytterbite',
];
$systems = [
'0-NTIS',
'1-NJLK',
'35-JWD',
'8KR9-5',
'EIMJ-M',
'F-M1FU',
'G-C8QO',
'I6M-9U',
'L5D-ZL',
'L-YMYU',
'VQE-CN',
'VR-YIQ',
'XZ-SKZ',
'Y-CWQY',
];
//Get all of the moons which are not rented
$allyMoons = AllianceMoon::all();
foreach($allyMoons as $moon) {
$ores = AllianceMoonOre::where([
'moon_id' => $moon->moon_id,
])->get()->toArray();
$moons->push([
'system' => $moon->system_name,
'ores' => $ores;
]);
}
return view('miningtax.user.display.moons.allmoons')->with('moons', $moons)
->with('systems', $systems);
->with('r4Goo', $r4Goo)
->with('r8Goo', $r8Goo)
->with('r16Goo', $r16Goo)
->with('r32Goo', $r32Goo)
->with('r64Goo', $r64Goo);
}
/**
* Display an invoice based on it's id
*
@@ -114,12 +291,12 @@ class MiningTaxesController extends Controller
$paidAmount += $p->invoice_amount;
}
return view('miningtax.user.display.invoices')->with('unpaid', $unpaid)
->with('late', $late)
->with('deferred', $deferred)
->with('paid', $paid)
->with('unpaidAmount', $unpaidAmount)
->with('paidAmount', $paidAmount);
return view('miningtax.user.display.invoices.invoices')->with('unpaid', $unpaid)
->with('late', $late)
->with('deferred', $deferred)
->with('paid', $paid)
->with('unpaidAmount', $unpaidAmount)
->with('paidAmount', $paidAmount);
}
/**
@@ -228,7 +405,7 @@ class MiningTaxesController extends Controller
]);
//Return the view with the extractions variable for html processing
return view('miningtax.user.display.upcoming')->with('structures', $structures)
return view('miningtax.user.display.pulls.upcoming')->with('structures', $structures)
->with('lava', $lava)
->with('calendar', $calendar);
}
@@ -304,7 +481,7 @@ class MiningTaxesController extends Controller
}
//Return the view
return view('miningtax.user.display.ledger')->with('miningLedgers', $miningLedgers)
return view('miningtax.user.display.details.ledger')->with('miningLedgers', $miningLedgers)
->with('structures', $structures);
}
}

46
app/Http/Controllers/MoonRental/MoonRentalAdminController.php
View File

@@ -1,46 +0,0 @@
<?php
namespace App\Http\Controllers\MoonRental;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Carbon\Carbon;
use Log;
class MoonRentalAdminController extends Controller
{
//Constructor
public function __construct() {
$this->middleware('role:Admin');
$this->middleware('permission:moon.rental.manager');
}
/**
* Display rental requests
*/
public function displayRentalRequests() {
}
/**
* Create monthly moon rental
*/
public function storeRentalRequest() {
}
/**
* Delete / remove monthly moon rental
*/
public function updateRentalRequest() {
}
/**
* Display current monthly moon rentals
*/
public function displayCurrentRentals() {
}
}

48
app/Http/Controllers/MoonRental/MoonRentalController.php
View File

@@ -1,48 +0,0 @@
<?php
namespace App\Http\Controllers\MoonRental;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Carbon\Carbon;
use Log;
class MoonRentalController extends Controller
{
//Constructor
public function __construct() {
$this->middleware('role:user');
}
/**
* Display all of the available moons for rental
*/
public function displayMoons() {
$moons = AllianceMoon::where([
'rented' => 'No',
])->get();
return view('moon.rental.available.display')->with('moons', $moons);
}
/**
* Display moon rental request form
*/
public function displayMoonRentalRequestForm() {
}
/**
* Store moon rental from the request form
*/
public function storeMoonRentalRequest() {
}
/**
* Request a mail job be added to the mail queue to resend mining bill instantly
*/
public function requestMoonRentalBill() {
}
}

0
resources/views/miningtax/user/display/ledger.blade.php → resources/views/miningtax/user/display/details/ledger.blade.php
View File

0
resources/views/miningtax/user/display/invoices.blade.php → resources/views/miningtax/user/display/invoices/invoices.blade.php
View File

184
resources/views/miningtax/user/display/moons/allmoons.blade.php Normal file
View File

@@ -0,0 +1,184 @@
@extends('layouts.user.dashb4')
@section('content')
<div class="container-fluid">
<div class="row">
<div class="container">
<h2>Moons in Warped Intentions Sovreignty</h2>
</div>
</div>
<br>
<ul class="nav nav-pills">
@foreach($systems as $system)
<li class="nav-item">
<a class="nav-link" data-toggle="pill" href="#W4RP-{{$system}}">{{$system}}</a>
</li>
@endforeach
</ul>
<br>
<div class="tab-content">
@foreach($systems as $system)
<div id="W4RP-{{ $system }}" class="tab-pane fade">
<table class="table table-striped table-bordered">
<thead>
<th>Location</th>
<th>First Ore</th>
<th>First Quantity</th>
<th>Second Ore</th>
<th>Second Quantity</th>
<th>Third Ore</th>
<th>Third Quantity</th>
<th>Fourth Ore</th>
<th>Fourth Quantity</th>
</thead>
<tbody>
@foreach($moons as $moon)
@if($moon['system'] == $system)
<tr>
@if(isset($moon['ores'][0]))
@if(in_array($moon['ores'][0], $r4Goo))
<td class="table-secondary">{{ $moon['ores'][0]['ore_name'] }}</td>
<td class="table-secondary">{{ round(($moon['ores'][0]['quantity'] * 100.0), 2) }}
@endif
@if(in_array($moon['ores'][0], $r8Goo))
<td class="table-primary">{{ $moon['ores'][0]['ore_name'] }}</td>
<td class="table-primary">{{ round(($moon['ores'][0]['quantity'] * 100.0), 2) }}
@endif
@if(in_array($moon['ores'][0], $r16Goo))
<td class="table-success">{{ $moon['ores'][0]['ore_name'] }}</td>
<td class="table-success">{{ round(($moon['ores'][0]['quantity'] * 100.0), 2) }}
@endif
@if(in_array($moon['ores'][0], $r32Goo))
<td class="table-warning">{{ $moon['ores'][0]['ore_name'] }}</td>
<td class="table-warning">{{ round(($moon['ores'][0]['quantity'] * 100.0), 2) }}
@endif
@if(in_array($moon['ores'][0], $r64Goo))
<td class="table-danger">{{ $moon['ores'][0]['ore_name'] }}</td>
<td class="table-danger">{{ round(($moon['ores'][0]['quantity'] * 100.0), 2) }}
@endif
@else
<td></td>
<td></td>
@endif
@if(isset($moon['ores'][1]))
@if(in_array($moon['ores'][1], $r4Goo))
<td class="table-secondary">{{ $moon['ores'][1]['ore_name'] }}</td>
<td class="table-secondary">{{ round(($moon['ores'][1]['quantity'] * 100.0), 2) }}
@endif
@if(in_array($moon['ores'][1], $r8Goo))
<td class="table-primary">{{ $moon['ores'][1]['ore_name'] }}</td>
<td class="table-primary">{{ round(($moon['ores'][1]['quantity'] * 100.0), 2) }}
@endif
@if(in_array($moon['ores'][1], $r16Goo))
<td class="table-success">{{ $moon['ores'][1]['ore_name'] }}</td>
<td class="table-success">{{ round(($moon['ores'][1]['quantity'] * 100.0), 2) }}
@endif
@if(in_array($moon['ores'][1], $r32Goo))
<td class="table-warning">{{ $moon['ores'][1]['ore_name'] }}</td>
<td class="table-warning">{{ round(($moon['ores'][1]['quantity'] * 100.0), 2) }}
@endif
@if(in_array($moon['ores'][1], $r64Goo))
<td class="table-danger">{{ $moon['ores'][1]['ore_name'] }}</td>
<td class="table-danger">{{ round(($moon['ores'][1]['quantity'] * 100.0), 2) }}
@endif
@else
<td></td>
<td></td>
@endif
@if(isset($moon['ores'][2]))
@if(in_array($moon['ores'][2], $r4Goo))
<td class="table-secondary">{{ $moon['ores'][2]['ore_name'] }}</td>
<td class="table-secondary">{{ round(($moon['ores'][2]['quantity'] * 100.0), 2) }}
@endif
@if(in_array($moon['ores'][2], $r8Goo))
<td class="table-primary">{{ $moon['ores'][2]['ore_name'] }}</td>
<td class="table-primary">{{ round(($moon['ores'][2]['quantity'] * 100.0), 2) }}
@endif
@if(in_array($moon['ores'][2], $r16Goo))
<td class="table-success">{{ $moon['ores'][2]['ore_name'] }}</td>
<td class="table-success">{{ round(($moon['ores'][2]['quantity'] * 100.0), 2) }}
@endif
@if(in_array($moon['ores'][2], $r32Goo))
<td class="table-warning">{{ $moon['ores'][2]['ore_name'] }}</td>
<td class="table-warning">{{ round(($moon['ores'][2]['quantity'] * 100.0), 2) }}
@endif
@if(in_array($moon['ores'][2], $r64Goo))
<td class="table-danger">{{ $moon['ores'][2]['ore_name'] }}</td>
<td class="table-danger">{{ round(($moon['ores'][2]['quantity'] * 100.0), 2) }}
@endif
@else
<td></td>
<td></td>
@endif
@if(isset($moon['ores'][3]))
@if(in_array($moon['ores'][3], $r4Goo))
<td class="table-secondary">{{ $moon['ores'][3]['ore_name'] }}</td>
<td class="table-secondary">{{ round(($moon['ores'][3]['quantity'] * 100.0), 2) }}
@endif
@if(in_array($moon['ores'][3], $r8Goo))
<td class="table-primary">{{ $moon['ores'][3]['ore_name'] }}</td>
<td class="table-primary">{{ round(($moon['ores'][3]['quantity'] * 100.0), 2) }}
@endif
@if(in_array($moon['ores'][3], $r16Goo))
<td class="table-success">{{ $moon['ores'][3]['ore_name'] }}</td>
<td class="table-success">{{ round(($moon['ores'][3]['quantity'] * 100.0), 2) }}
@endif
@if(in_array($moon['ores'][3], $r32Goo))
<td class="table-warning">{{ $moon['ores'][3]['ore_name'] }}</td>
<td class="table-warning">{{ round(($moon['ores'][3]['quantity'] * 100.0), 2) }}
@endif
@if(in_array($moon['ores'][3], $r64Goo))
<td class="table-danger">{{ $moon['ores'][3]['ore_name'] }}</td>
<td class="table-danger">{{ round(($moon['ores'][3]['quantity'] * 100.0), 2) }}
@endif
@else
<td></td>
<td></td>
@endif
</tr>
@endif
@endforeach
</tbody>
</table>
</div>
@endforeach
</div>
</div>
<br>
<div class="container-fluid">
<div class="row">
<div class="col">
<div class="card">
<div class="card-header">
Legend
</div>
<div class="card-body">
<table class="table table-striped">
<tbody>
<tr class="table-secondary">
<td>R4 Ore</td>
</tr>
<tr class="table-primary">
<td>R8 Ore</td>
</tr>
<tr class="table-success">
<td>R16 Ore</td>
</tr>
<tr class="table-warning">
<td>R32 Ore</td>
</tr>
<tr class="table-danger">
<td>R64 Ore</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div class="col"></div>
<div class="col"></div>
<div class="col"></div>
<div class="col"></div>
<div class="col"></div>
</div>
</div>
@endsection

10
resources/views/moons/user/allmoons.blade.php → resources/views/miningtax/user/display/moons/allmoons_bak.blade.php
View File

@@ -42,7 +42,7 @@
@endif
<td>{{ $moon->System . " - " . $moon->Planet . " - " . $moon->Moon }}</td>
<td>{{ $moon->Corporation }}</td>
@if(in_array($moon->FirstOre, $gasGoo))
@if(in_array($moon->FirstOre, $r4Goo))
<td class="table-secondary">{{ $moon->FirstOre }}</td>
<td class="table-secondary">{{ $moon->FirstQuantity }}</td>
@elseif(in_array($moon->FirstOre, $r8Goo))
@@ -61,7 +61,7 @@
<td>{{ $moon->FirstOre }}</td>
<td>{{ $moon->FirstQuantity }}</td>
@endif
@if(in_array($moon->SecondOre, $gasGoo))
@if(in_array($moon->SecondOre, $r4Goo))
<td class="table-secondary">{{ $moon->SecondOre }}</td>
<td class="table-secondary">{{ $moon->SecondQuantity }}</td>
@elseif(in_array($moon->SecondOre, $r8Goo))
@@ -80,7 +80,7 @@
<td>{{ $moon->SecondOre }}</td>
<td>{{ $moon->SecondQuantity }}</td>
@endif
@if(in_array($moon->ThirdOre, $gasGoo))
@if(in_array($moon->ThirdOre, $r4Goo))
<td class="table-secondary">{{ $moon->ThirdOre }}</td>
<td class="table-secondary">{{ $moon->ThirdQuantity }}</td>
@elseif(in_array($moon->ThirdOre, $r8Goo))
@@ -99,7 +99,7 @@
<td>{{ $moon->ThirdOre }}</td>
<td>{{ $moon->ThirdQuantity }}</td>
@endif
@if(in_array($moon->FourthOre, $gasGoo))
@if(in_array($moon->FourthOre, $r4Goo))
<td class="table-secondary">{{ $moon->FourthOre }}</td>
<td class="table-secondary">{{ $moon->FourthQuantity }}</td>
@elseif(in_array($moon->FourthOre, $r8Goo))
@@ -140,7 +140,7 @@
<table class="table table-striped">
<tbody>
<tr class="table-secondary">
<td>Gas Ore</td>
<td>R4 Ore</td>
</tr>
<tr class="table-primary">
<td>R8 Ore</td>

0
resources/views/miningtax/user/display/upcoming.blade.php → resources/views/miningtax/user/display/pulls/upcoming.blade.php
View File

10
routes/web.php
View File

@@ -94,14 +94,8 @@ Route::group(['middleware' => ['auth']], function(){
Route::post('/miningtax/admin/delete/invoice', 'MiningTaxes\MiningTaxesAdminController@DeleteInvoice');
Route::get('/miningtax/admin/display/paid', 'MiningTaxes\MiningTaxesAdminController@DisplayPaidInvoices');
Route::any('/miningtax/admin/display/unpaid/search', 'MiningTaxes\MiningTaxesAdminController@SearchUnpaidInvoice');
/**
* Moon Rental display pages
*/
/**
* Planetary Interaction Display pages
*/
Route::get('/miningtax/display/availablemoons', 'MiningTaxes\MiningTaxesController@displayAvailableMoons');
Route::get('/miningtax/display/allmoons', 'MiningTaxes\MiningTaxesController@displayAllMoons');
/**
* Scopes Controller display pages