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

modified fuel controller for jump gates

Browse Source
This commit is contained in:
drkthunder02
2020-04-03 02:46:30 -05:00
parent 73d27ba44f
commit 943735a7c7
8 changed files with 3 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Logistics/FuelController.php
View File

@@ -1,6 +1,6 @@
<?php
namespace App\Http\Controllers\Fuel;
namespace App\Http\Controllers\Logistics;
//Internal Library
use Illuminate\Http\Request;
@@ -80,8 +80,7 @@ class FuelController extends Controller
],
]);
return view('logistics.display.fuel')->with('jumpGates', $jumpGates)
return view('logistics.fuel')->with('jumpGates', $jumpGates)
->with('lava', $lava);
}
}

40
resources/views/layouts/admin/permissions/b4.blade.php
View File

@@ -1,40 +0,0 @@
<!doctype html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head>
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-140677389-1"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'UA-140677389-1');
</script>
<title>{{ config('app.name', 'W4RP Services') }}</title>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">
<!-- Bootstrap CSS
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.2/css/bootstrap.min.css" integrity="sha384-Smlep5jCw/wG7hdkwQ/Z5nLIefveQRIY9nfy6xoR1uRYBtpZgI6339F5dgvm/e9B" crossorigin="anonymous">
-->
<link rel="stylesheet" href="{{ asset('css/app.css') }}">
@include('inc.ajax.permissions')
</head>
<body>
@include('layouts.navbar')
<div class="container">
@include('inc.messages')
</div>
@yield('content')
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.2/js/bootstrap.min.js" integrity="sha384-o+RDsa0aLu++PJvFqy8fFScvbHFLtbvScb8AjopnFD+iEQ7wo/CG0xlczd+2O/em" crossorigin="anonymous"></script>
</body>
</html>

110
resources/views/logistics/display/contracts.blade.php
View File

@@ -1,110 +0,0 @@
@extends('layouts.b4')
@section('content')
@if($totalCount == 0)
<div class="card">
<div class="card-header">
<h2>Logistics Contracts</h2>
</div>
<div class="card-body">
<h3>No open logistics contracts</h3>
</div>
</div>
@else
<div class="card">
<div class="card-header">
<h2>Status</h2>
</div>
<div class="card-body">
<div id="gauge-status-div"></div>
{!! $lava->render('GaugeChart', 'Open Contracts', 'gauge-status-div') !!}
</div>
</div>
<div class="card">
<div class="card-header">
<h2>Open Contracts</h2>
</div>
<div class="card-body">
<table class="table table-striped">
<thead>
<th>Date Issued</th>
<th>Days To Complete</th>
<th>Collateral</th>
<th>Reward</th>
<th>Volume</th>
<th>Status</th>
</thead>
<tbody>
@foreach($open as $op)
<tr>
<td>{{ $op->date_issued }}</td>
<td>{{ $op->days_to_complete }}</td>
<td>{{ $op->collateral }}</td>
<td>{{ $op->reward }}</td>
<td>{{ $op->volume }}</td>
<td>{{ $op->status }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
<div class="card">
<div class="card-header">
<h2>In Progress Contracts</h2>
</div>
<div class="card-body">
<table class="table table-striped">
<thead>
<th>Date Issued</th>
<th>Days To Complete</th>
<th>Collateral</th>
<th>Reward</th>
<th>Volume</th>
<th>Status</th>
</thead>
<tbody>
@foreach($inProgress as $in)
<tr>
<td>{{ $in->date_issued }}</td>
<td>{{ $in->days_to_complete }}</td>
<td>{{ $in->collateral }}</td>
<td>{{ $in->reward }}</td>
<td>{{ $in->volume }}</td>
<td>{{ $in->status }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
<div class="card">
<div class="card-header">
<h2>Finished Contracts</h2>
</div>
<div class="card-body">
<table class="table table-striped">
<thead>
<th>Date Issued</th>
<th>Days To Complete</th>
<th>Collateral</th>
<th>Reward</th>
<th>Volume</th>
<th>Status</th>
</thead>
<tbody>
@foreach($finished as $fin)
<tr>
<td>{{ $fin->date_issued }}</td>
<td>{{ $fin->days_to_complete }}</td>
<td>{{ $fin->collateral }}</td>
<td>{{ $fin->reward }}</td>
<td>{{ $fin->volume }}</td>
<td>{{ $fin->status }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
@endif
@endsection

17
resources/views/logistics/display/courier.blade.php
View File

@@ -1,17 +0,0 @@
@extends('layouts.b4')
@section('content')
<div class="card">
<div class="card-header">
<h2>Courier Contract Details</h2>
</div>
<div class="card-body">
Start System: {{ $startSystem }}<br>
End System: {{ $endSystem }}<br>
Contract To: {{ $corporation }}<br>
Reward: {{ number_format($reward, 2, '.', ',') }}<br>
Collateral: {{ number_format($collateral, 2, '.', ',') }}<br>
Expiration: 7 days<br>
Days To Complete: 7 days<br>
</div>
</div>
@endsection

33
resources/views/logistics/display/courierform.blade.php
View File

@@ -1,33 +0,0 @@
@extends('layouts.b4')
@section('content')
<div class="container">
<div class="card">
<div class="card-header">
<h2>Courier Calculation Form</h2>
</div>
<div class="card-body">
{!! Form::open([
'action' => 'Logistics\LogisticsController@displayContractDetails',
'method' => 'POST',
]) !!}
<div class="form-group">
{{ Form::label('route', 'Route') }}
{{ Form::select('route', $routes, 'None', ['class' => 'form-control']) }}
</div>
<div class="form-group">
{{ Form::label('volume', 'Volume') }}
{{ Form::text('volume', null, ['class' => 'form-control']) }}
</div>
<div class="form-group">
{{ Form::label('collateral', 'Collateral') }}
{{ Form::text('collateral', null, ['class' => 'form-control', 'placeholder' => '1,000.00 ISK']) }}
</div>
<div class="form-group">
{{ Form::label('type', 'Type') }}
{{ Form::select('type', $type, 'None', ['class' => 'form-control']) }}
</div>
{{ Form::submit('Submit', ['class' => 'btn btn-primary']) }}
</div>
</div>
</div>
@endsection

0
resources/views/logistics/display/fuel.blade.php → resources/views/logistics/fuel.blade.php
View File

41
resources/views/logistics/layouts/b4.blade.php
View File

@@ -1,41 +0,0 @@
<!doctype html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head>
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-140677389-1"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'UA-140677389-1');
</script>
<title>{{ config('app.name', 'W4RP Services') }}</title>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">
<!-- Bootstrap CSS
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.2/css/bootstrap.min.css" integrity="sha384-Smlep5jCw/wG7hdkwQ/Z5nLIefveQRIY9nfy6xoR1uRYBtpZgI6339F5dgvm/e9B" crossorigin="anonymous">
-->
<link rel="stylesheet" href="{{ asset('css/app.css') }}">
<link rel="stylesheet" href="{{ asset('css/bootstrap.css') }}">
</head>
<body>
@include('layouts.navbar')
<div class="container">
@include('inc.messages')
</div>
@yield('content')
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.1/Chart.min.js" charset="utf-8"></script>
</body>
</html>

2
routes/web.php
View File

@@ -108,7 +108,7 @@ Route::group(['middleware' => ['auth']], function(){
/**
* Fuel Controller display pages
*/
Route::get('/logistics/fuel/structures', 'Fuel\FuelController@displayStructures');
Route::get('/logistics/fuel/structures', 'Logistics\FuelController@displayStructures');
/**
* Moon Controller display pages