From e5771980badf2a0e9a398f0b877f2a629e01f198 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Mon, 8 Jul 2019 23:14:13 -0500 Subject: [PATCH] cleanup of fuel gauge for structures --- .../Controllers/Logistics/FuelController.php | 47 ------------------- .../views/logistics/display/fuel.blade.php | 2 - .../logistics/display/fuelgauge.blade.php | 16 ------- routes/web.php | 1 - 4 files changed, 66 deletions(-) delete mode 100644 resources/views/logistics/display/fuelgauge.blade.php diff --git a/app/Http/Controllers/Logistics/FuelController.php b/app/Http/Controllers/Logistics/FuelController.php index 5b5ea1b0b..8d450b02c 100644 --- a/app/Http/Controllers/Logistics/FuelController.php +++ b/app/Http/Controllers/Logistics/FuelController.php @@ -84,51 +84,4 @@ class FuelController extends Controller ->with('lava', $lava); } - /** - * Get the structure id passed to it and display fuel gauage for structure - */ - public function displayStructureFuel($id) { - //Declare class variables - $lava = new Lavacharts; - $aHelper = new AssetHelper(null, null, null); - - $structure = Structure::where(['structure_id' => $id])->first(); - $name = $structure['structure_name']; - - //Get the quantity of liquid ozone in the structure - $liquidOzone = $aHelper->GetAssetByType(16273, $id); - - if($liquidOzone > 1000000) { - $liquidOzone = 1000000; - } - - $gauge = $lava->DataTable(); - $gauge->addStringColumn('Fuel') - ->addNumberColumn('Units') - ->addRow(['Liquid Ozone', $liquidOzone]); - - - $lava->GaugeChart('Liquid Ozone', $gauge, [ - 'min' => 0, - 'max' => 1000000, - 'width' => 400, - 'greenFrom' => 0, - 'greenTo' => 150000, - 'greenColor' => '#DC3912', - 'yellowFrom' => 150000, - 'yellowTo' => 300000, - 'yellowColor' => '#FF9900', - 'redFrom' => 300000, - 'redTo' => 1000000, - 'redColor' => '#109618', - 'majorTicks' => [ - 'Empty', - 'Full', - ], - ]); - - //Return the view - return view('logistics.display.fuelgauge')->with('lava', $lava) - ->with('name', $name); - } } diff --git a/resources/views/logistics/display/fuel.blade.php b/resources/views/logistics/display/fuel.blade.php index 45a19433d..86a2e9570 100644 --- a/resources/views/logistics/display/fuel.blade.php +++ b/resources/views/logistics/display/fuel.blade.php @@ -18,7 +18,6 @@ System Fuel Expires Liquid Ozone Quantity - Fuel Gauge @foreach($jumpGates as $jumpGate) @@ -27,7 +26,6 @@ {{ $jumpGate['system'] }} {{ $jumpGate{'fuel_expires'} }} {{ $jumpGate['liquid_ozone'] }} - Link @endforeach diff --git a/resources/views/logistics/display/fuelgauge.blade.php b/resources/views/logistics/display/fuelgauge.blade.php deleted file mode 100644 index b979ea651..000000000 --- a/resources/views/logistics/display/fuelgauge.blade.php +++ /dev/null @@ -1,16 +0,0 @@ -@extends('logistics.layouts.b4') -@section('content') -
-
-
-
-

{{ $name }}

-
-
-
- {!! $lava->render('GaugeChart', 'Liquid Ozone', 'fuel-gauge-div') !!} -
-
-
-
-@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 77c093c39..bf1d6bb47 100644 --- a/routes/web.php +++ b/routes/web.php @@ -118,7 +118,6 @@ Route::group(['middleware' => ['auth']], function(){ Route::post('/logistics/courier/form', 'Logistics\LogisticsController@displayContractDetails'); Route::get('/logistics/contracts/display', 'Logistics\LogisticsController@displayLogisticsContracts'); Route::get('/logistics/fuel/structures', 'Fuel\FuelController@displayStructures'); - Route::get('/logistics/fuel/display/{id}/', 'Fuel\FuelController@displayStructureFuel'); }); /**