From a212b1506839fd1491b3257e29aa4ed1ec19655a Mon Sep 17 00:00:00 2001
From: drkthunder02 <mancuso.christopher@gmail.com>
Date: Mon, 8 Jul 2019 22:09:33 -0500
Subject: [PATCH] fuel gauage modification

---
 app/Charts/StructureFuelGauge.php             | 21 ++++++++++
 .../Controllers/Logistics/FuelController.php  | 13 ++++--
 config/app.php                                |  2 +
 config/charts.php                             | 15 +++++++
 .../logistics/display/fuelgauge.blade.php     |  4 +-
 resources/views/logistics/layout/b4.blade.php | 41 +++++++++++++++++++
 6 files changed, 91 insertions(+), 5 deletions(-)
 create mode 100644 app/Charts/StructureFuelGauge.php
 create mode 100644 config/charts.php
 create mode 100644 resources/views/logistics/layout/b4.blade.php

diff --git a/app/Charts/StructureFuelGauge.php b/app/Charts/StructureFuelGauge.php
new file mode 100644
index 000000000..e525218c0
--- /dev/null
+++ b/app/Charts/StructureFuelGauge.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Charts;
+
+//Internal Library
+use ConsoleTVs\Charts\Classes\ChartJs\Chart;
+
+class StructureFuelGauge extends Chart
+{
+    /**
+     * Initializes the chart.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+
+}
diff --git a/app/Http/Controllers/Logistics/FuelController.php b/app/Http/Controllers/Logistics/FuelController.php
index 7de12557a..8d5473a97 100644
--- a/app/Http/Controllers/Logistics/FuelController.php
+++ b/app/Http/Controllers/Logistics/FuelController.php
@@ -10,6 +10,7 @@ use Log;
 use Carbon\Carbon;
 use Khill\Lavacharts\Lavacharts;
 use Auth;
+use Charts;
 
 //Library Helpers
 use App\Library\Assets\AssetHelper;
@@ -57,6 +58,7 @@ class FuelController extends Controller
     public function displayStructureFuel($id) {
         //Declare class variables
         $lava = new Lavacharts;
+        $chartJs = new StructureFuelGauage;
         $aHelper = new AssetHelper(null, null, null);
 
         $structure = Structure::where(['structure_id' => $id])->first();
@@ -71,12 +73,15 @@ class FuelController extends Controller
               ->addRow(['Liquid Ozone', $liquidOzone]);
         $lava->GaugeChart('Liquid Ozone', $gauge, [
             'width' => 400,
-            'redFrom' => 0,
-            'redTo' => 75000,
+            'greenFrom' => 0,
+            'greenTo' => 75000,
+            'greenColor' => '#DC3912',
             'yellowFrom' => 75000,
             'yellowTo' => 150000,
-            'greenFrom' => 150000,
-            'greenTo' => 1000000,
+            'yellowColor' => '#FF9900',
+            'redFrom' => 150000,
+            'redTo' => 1000000,
+            'redColor' => '#109618',
             'majorTicks' => [
                 'Empty',
                 'Ok',
diff --git a/config/app.php b/config/app.php
index 454dc03ef..6de212f42 100644
--- a/config/app.php
+++ b/config/app.php
@@ -154,6 +154,7 @@ return [
         //nullx27\Socialite\EveOnline\Providers\EveOnlineServiceProvider::class,
         Laravel\Socialite\SocialiteServiceProvider::class,
         Khill\Lavacharts\Laravel\LavachartsServiceProvider::class,
+        ConsoleTVs\Charts\ChartsServiceProvider::class,
 
 
         /*
@@ -218,6 +219,7 @@ return [
         'Html' => Collective\Html\HtmlFacade::class,
         'Socialite' => Laravel\Socialite\Facades\Socialite::class,
         'Lava' => Khill\Lavacharts\Laravel\LavachartsFacade::class,
+        'Charts' => ConsoleTVs\Charts\Charts::class,
     ],
 
 ];
diff --git a/config/charts.php b/config/charts.php
new file mode 100644
index 000000000..b1a19c4e5
--- /dev/null
+++ b/config/charts.php
@@ -0,0 +1,15 @@
+<?php
+
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | Default library used in charts.
+    |--------------------------------------------------------------------------
+    |
+    | This value is used as the default chart library used when creating
+    | any chart in the command line. Feel free to modify it or set it up
+    | while creating the chart to ignore this value.
+    |
+    */
+    'default_library' => 'Chartjs',
+];
diff --git a/resources/views/logistics/display/fuelgauge.blade.php b/resources/views/logistics/display/fuelgauge.blade.php
index 60f539b5b..b979ea651 100644
--- a/resources/views/logistics/display/fuelgauge.blade.php
+++ b/resources/views/logistics/display/fuelgauge.blade.php
@@ -1,5 +1,6 @@
-@extends('layouts.b4')
+@extends('logistics.layouts.b4')
 @section('content')
+<br>
 <div class="container">
     <div class="card">
         <div class="card-header">
@@ -11,4 +12,5 @@
         </div>
     </div>
 </div>
+<br>
 @endsection
\ No newline at end of file
diff --git a/resources/views/logistics/layout/b4.blade.php b/resources/views/logistics/layout/b4.blade.php
new file mode 100644
index 000000000..008bd9897
--- /dev/null
+++ b/resources/views/logistics/layout/b4.blade.php
@@ -0,0 +1,41 @@
+<!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>
\ No newline at end of file