update for troubleshooting

This commit is contained in:
2020-06-22 20:18:31 -05:00
parent 60d47747ba
commit 49e1ec3638
4 changed files with 52 additions and 30 deletions

View File

@@ -1,11 +0,0 @@
<?php
namespace App\Http\Controllers\Api;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
class ApiController extends Controller
{
//
}

View File

@@ -43,17 +43,48 @@ class AdminDashboardController extends Controller
//Declare variables we will need
$days = 30;
$sovBills = array();
$pi = array();
$industry = array();
$reprocessing = array();
$office = array();
$sprActual = array();
$srpLoss = array();
$lava = new Lavacharts;
//Get the data for the sov expenses for a graph
//Setup the charts
//Setup the chart to be able the show the categories for income
/*
$iChart = $lava->DataTable();
$iChart->addStringColumn('Categories')
->addNumberColumn('ISK')
->addRow(['pi', $pi])
->addRow(['industry', $industry])
->addRow(['reprocessing', $reprocessing])
->addRow(['offices', $office])
->addRow(['industry', $industry])
->addRow(['market', $market])
->addRow(['gate', $gate])
->addRow(['iBuyback', $iBuyback])
->addRow(['renters', $renters])
->addRow(['ops', $ops]);
*/
//Setup the chart to be able to show the categories for expenses
/*
$eChart = $lava->DataTable();
$eCjart->addStringColumn('Categories')
->addNumberColumn('ISK')
->addRow(['sov', $sovBills])
->addRow(['srp', $srpActual])
->addRow(['maintenance', $maintenance])
->addRow(['wardecs', $wardecs])
->addRow(['fcs', $fcs])
->addRow(['keepstar_fuel', $keepstarFuel])
->addRow(['fortizar_fuel', $fortizarFuel])
->addRow(['astrahus_fuel', $astrahusFuel])
->addRow(['sotiyo_fuel', $sotiyoFuel])
->addRow(['azbel_fuel', $azbelFuel])
->addRow(['raitaru_fuel', $raitaruFuel])
->addRow(['beacon_fuel', $beaconFuel])
->addRow(['bridge_fuel', $bridgeFuel])
->addRow(['jammer_fuel', $jammerFuel]);
*/
return view('admin.dashboards.dashboard');
}
}

View File

@@ -274,17 +274,6 @@ class MoonsAdminController extends Controller
$ticker = 'N/A';
$type = 'N/A';
}
//Set up the moon rental type
if($moon->rental_type == 'In Alliance') {
$type = 'IA';
} else if($moon->rental_type == 'Out of Alliance') {
$type = 'OOA';
} else if($moon->rental_type == 'Alliance') {
$type = 'W4RP';
} else {
$type = 'N/A';
}
//Check if the moon is currently being utilized by the alliance
} else if($moon->rental_type == 'Alliance') {
@@ -325,6 +314,17 @@ class MoonsAdminController extends Controller
$type = 'N/A';
}
//Set up the moon rental type
if($moon->rental_type == 'In Alliance') {
$type = 'IA';
} else if($moon->rental_type == 'Out of Alliance') {
$type = 'OOA';
} else if($moon->rental_type == 'Alliance') {
$type = 'W4RP';
} else {
$type = 'N/A';
}
//Set the color for the table
if($moon->rental_type != 'Alliance') {
if($rentalTemp->diffInDays($today) < 3) {

View File

@@ -295,6 +295,8 @@ class MoonsController extends Controller
]);
}
dd($table);
//Pass the data to the view
return view('moons.user.moon')->with('table', $table);
}