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

updates to controllers

Browse Source
This commit is contained in:
drkthunder02
2018-12-13 21:44:25 -06:00
parent b4006e3637
commit 2cd6f6f3f8
8 changed files with 103 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/EsiScopeController.php
View File

@@ -10,11 +10,6 @@ use Auth;
use App\User;
use Seat\Eseye\Cache\NullCache;
use Seat\Eseye\Configuration;
use Seat\Eseye\Containers\EsiAuthentication;
use Seat\Eseye\Eseye;
class EsiScopeController extends Controller
{
public function __construct() {

43
app/Http/Controllers/MoonsAdminController.php
View File

@@ -6,14 +6,11 @@ use Illuminate\Http\Request;
use Auth;
use DB;
use Carbon\Carbon;
use App\Models\Moon\Moon;
use Seat\Eseye\Cache\NullCache;
use Seat\Eseye\Configuration;
use Seat\Eseye\Containers\EsiAuthentication;
use Seat\Eseye\Eseye;
use App\Models\Finances\PlayerDonationJournal;
use App\Library\MoonCalc;
class MoonsAdminController extends Controller
@@ -23,6 +20,27 @@ class MoonsAdminController extends Controller
$this->middleware('role:Admin');
}
public function showJournalEntries() {
$esi = new Esi();
$date = Carbon::today()->subDays(30);
$journal = PlayerDonationJournal::where(
['corporation_id', '=', '98287666'],
['date', '>=', $date->toDateTimeString()])->get([
'amount',
'date',
'description',
'first_party_id',
]);
foreach($journal as $journ) {
$journ->first_party_id = $esi->GetCharacterName($journ->first_party_id);
}
return view('moons.spatialjournal')->with('journal', $journal);
}
public function updateMoon() {
return view('moons.updatemoon');
}
@@ -38,13 +56,11 @@ class MoonsAdminController extends Controller
$date = strtotime($request->date . '00:00:01');
//Update the database entry
DB::table('Moons')
->where([
['System', '=', $request->system],
['Planet', '=', $request->planet],
['Moon', '=', $request->moon]
])
->update([
Moon::where([
'System' => $request->system,
'Planet' => $request->planet,
'Moon' => $request->moon,
])->update([
'RentalCorp' => $request->renter,
'RentalEnd' => $date,
]);
@@ -121,7 +137,8 @@ class MoonsAdminController extends Controller
//Update the prices for the moon
$moonCalc->FetchNewPrices();
//get all of the moons from the database
$moons = DB::table('Moons')->orderBy('System', 'asc')->get();
$moons = Moon::orderBy('System', 'asc')->get();
//$moons = DB::table('Moons')->orderBy('System', 'asc')->get();
//declare the html variable and set it to null
$html = '';
foreach($moons as $moon) {

5
app/Http/Controllers/MoonsController.php
View File

@@ -8,11 +8,6 @@ use Illuminate\Http\Request;
use App\Models\Moon\Moon;
use Seat\Eseye\Cache\NullCache;
use Seat\Eseye\Configuration;
use Seat\Eseye\Containers\EsiAuthentication;
use Seat\Eseye\Eseye;
use App\Library\MoonCalc;
class MoonsController extends Controller

9
app/Library/Esi.php
View File

@@ -36,6 +36,15 @@ class Esi {
return false;
}
public function GetCharacterName($charId) {
$esi = new Eseye();
$character = $esi->invoke('get', '/characters/{character_id}/', [
'character_id' => $charId,
]);
return $character->name;
}
public function FindCharacterId($name) {
$config = config('esi');
//Create the esi authentication container

28
database/migrations/2018_12_14_030608_drop_holding_corp_finances_journal_table.php Normal file
View File

@@ -0,0 +1,28 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class DropHoldingCorpFinancesJournalTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::dropIfExists('HoldingCorpFinancesJournal');
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
//
}
}

25
resources/views/moons/moonjournal.blade.php Normal file
View File

@@ -0,0 +1,25 @@
@extends('layouts.b4')
@section('content')
<div class="container col-md-12">
<table class="table table-striped">
<thead>
<th>Name</th>
<th>Date</th>
<th>Description</th>
<th>Amount</th>
</thead>
<tbody>
@foreach($journal as $journ)
<tr>
<td>{{ $journ->first_party_id }}</td>
<td>{{ $journ->date }}</td>
<td>{{ $journ->description }}</td>
<td>{{ $journ->amount }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
@endsection

4
vendor/composer/autoload_classmap.php vendored
View File

@@ -27,7 +27,9 @@ return array(
'App\\Http\\Controllers\\EsiScopeController' => $baseDir . '/app/Http/Controllers/EsiScopeController.php',
'App\\Http\\Controllers\\FinancesController' => $baseDir . '/app/Http/Controllers/FinancesController.php',
'App\\Http\\Controllers\\FleetsController' => $baseDir . '/app/Http/Controllers/FleetsController.php',
'App\\Http\\Controllers\\JumpBridgeController' => $baseDir . '/app/Http/Controllers/JumpBridgeController.php',
'App\\Http\\Controllers\\LogisticsController' => $baseDir . '/app/Http/Controllers/LogisticsController.php',
'App\\Http\\Controllers\\MoonsAdminController' => $baseDir . '/app/Http/Controllers/MoonsAdminController.php',
'App\\Http\\Controllers\\MoonsController' => $baseDir . '/app/Http/Controllers/MoonsController.php',
'App\\Http\\Controllers\\RegisterStructureController' => $baseDir . '/app/Http/Controllers/RegisterStructureController.php',
'App\\Http\\Controllers\\StructureController' => $baseDir . '/app/Http/Controllers/StructureController.php',
@@ -50,6 +52,7 @@ return array(
'App\\Library\\MoonCalc' => $baseDir . '/app/Library/MoonCalc.php',
'App\\Library\\MoonMine' => $baseDir . '/app/Library/MoonMine.php',
'App\\Library\\SeatHelper' => $baseDir . '/app/Library/SeatHelper.php',
'App\\Library\\Structures\\StructureTaxHelper' => $baseDir . '/app/Library/Structures/StructureHelper.php',
'App\\Models\\Config' => $baseDir . '/app/Models/Config.php',
'App\\Models\\Corporation\\AllianceCorp' => $baseDir . '/app/Models/Corporation/AllianceCorp.php',
'App\\Models\\Corporation\\CorpJournal' => $baseDir . '/app/Models/Corporation/CorpJournal.php',
@@ -61,6 +64,7 @@ return array(
'App\\Models\\Doku\\DokuUser' => $baseDir . '/app/Models/Doku/DokuUser.php',
'App\\Models\\Esi\\EsiScope' => $baseDir . '/app/Models/Esi/EsiScope.php',
'App\\Models\\Esi\\EsiToken' => $baseDir . '/app/Models/Esi/EsiToken.php',
'App\\Models\\Finances\\PlayerDonationJournal' => $baseDir . '/app/Models/Finances/PlayerDonationJournal.php',
'App\\Models\\Fleet\\Fleet' => $baseDir . '/app/Models/Fleet/Fleet.php',
'App\\Models\\Fleet\\FleetActivity' => $baseDir . '/app/Models/Fleet/FleetActivity.php',
'App\\Models\\Logistics\\Contract' => $baseDir . '/app/Models/Logistics/Contract.php',

4
vendor/composer/autoload_static.php vendored
View File

@@ -422,7 +422,9 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
'App\\Http\\Controllers\\EsiScopeController' => __DIR__ . '/../..' . '/app/Http/Controllers/EsiScopeController.php',
'App\\Http\\Controllers\\FinancesController' => __DIR__ . '/../..' . '/app/Http/Controllers/FinancesController.php',
'App\\Http\\Controllers\\FleetsController' => __DIR__ . '/../..' . '/app/Http/Controllers/FleetsController.php',
'App\\Http\\Controllers\\JumpBridgeController' => __DIR__ . '/../..' . '/app/Http/Controllers/JumpBridgeController.php',
'App\\Http\\Controllers\\LogisticsController' => __DIR__ . '/../..' . '/app/Http/Controllers/LogisticsController.php',
'App\\Http\\Controllers\\MoonsAdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/MoonsAdminController.php',
'App\\Http\\Controllers\\MoonsController' => __DIR__ . '/../..' . '/app/Http/Controllers/MoonsController.php',
'App\\Http\\Controllers\\RegisterStructureController' => __DIR__ . '/../..' . '/app/Http/Controllers/RegisterStructureController.php',
'App\\Http\\Controllers\\StructureController' => __DIR__ . '/../..' . '/app/Http/Controllers/StructureController.php',
@@ -445,6 +447,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
'App\\Library\\MoonCalc' => __DIR__ . '/../..' . '/app/Library/MoonCalc.php',
'App\\Library\\MoonMine' => __DIR__ . '/../..' . '/app/Library/MoonMine.php',
'App\\Library\\SeatHelper' => __DIR__ . '/../..' . '/app/Library/SeatHelper.php',
'App\\Library\\Structures\\StructureTaxHelper' => __DIR__ . '/../..' . '/app/Library/Structures/StructureHelper.php',
'App\\Models\\Config' => __DIR__ . '/../..' . '/app/Models/Config.php',
'App\\Models\\Corporation\\AllianceCorp' => __DIR__ . '/../..' . '/app/Models/Corporation/AllianceCorp.php',
'App\\Models\\Corporation\\CorpJournal' => __DIR__ . '/../..' . '/app/Models/Corporation/CorpJournal.php',
@@ -456,6 +459,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
'App\\Models\\Doku\\DokuUser' => __DIR__ . '/../..' . '/app/Models/Doku/DokuUser.php',
'App\\Models\\Esi\\EsiScope' => __DIR__ . '/../..' . '/app/Models/Esi/EsiScope.php',
'App\\Models\\Esi\\EsiToken' => __DIR__ . '/../..' . '/app/Models/Esi/EsiToken.php',
'App\\Models\\Finances\\PlayerDonationJournal' => __DIR__ . '/../..' . '/app/Models/Finances/PlayerDonationJournal.php',
'App\\Models\\Fleet\\Fleet' => __DIR__ . '/../..' . '/app/Models/Fleet/Fleet.php',
'App\\Models\\Fleet\\FleetActivity' => __DIR__ . '/../..' . '/app/Models/Fleet/FleetActivity.php',
'App\\Models\\Logistics\\Contract' => __DIR__ . '/../..' . '/app/Models/Logistics/Contract.php',