consolidated upcoming extractions with the mining calendar
This commit is contained in:
@@ -96,6 +96,8 @@ class MiningTaxesController extends Controller
|
|||||||
$esiHelper = new Esi;
|
$esiHelper = new Esi;
|
||||||
$config = config('esi');
|
$config = config('esi');
|
||||||
$sHelper = new StructureHelper($config['primary'], $config['corporation']);
|
$sHelper = new StructureHelper($config['primary'], $config['corporation']);
|
||||||
|
$structures = array();
|
||||||
|
$lava = new Lavacharts;
|
||||||
|
|
||||||
if(!$esiHelper->HaveEsiScope($config['primary'], 'esi-industry.read_corporation_mining.v1')) {
|
if(!$esiHelper->HaveEsiScope($config['primary'], 'esi-industry.read_corporation_mining.v1')) {
|
||||||
return redirect('/dashboard')->with('error', 'Tell the nub Minerva to register the correct scopes for the services site.');
|
return redirect('/dashboard')->with('error', 'Tell the nub Minerva to register the correct scopes for the services site.');
|
||||||
@@ -125,6 +127,64 @@ class MiningTaxesController extends Controller
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a 3 month calendar for the past, current, and future extractions
|
||||||
|
*/
|
||||||
|
//Create the data tables
|
||||||
|
$calendar = $lava->DataTable();
|
||||||
|
|
||||||
|
$calendar->addDateTimeColumn('Date')
|
||||||
|
->addNumberColumn('Total');
|
||||||
|
|
||||||
|
foreach($extractions as $extraction) {
|
||||||
|
$sInfo = $sHelper->GetStructureInfo($extraction->structure_id);
|
||||||
|
array_push($structures, [
|
||||||
|
'date' => $esiHelper->DecodeDate($extraction->chunk_arrival_time),
|
||||||
|
'total' => 0,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach($extractions as $extraction) {
|
||||||
|
for($i = 0; $i < sizeof($structures); $i++) {
|
||||||
|
//Create the dates in a carbon object, then only get the Y-m-d to compare.
|
||||||
|
$tempStructureDate = Carbon::createFromFormat('Y-m-d H:i:s', $structures[$i]['date'])->toDateString();
|
||||||
|
$extractionDate = Carbon::createFromFormat('Y-m-d H:i:s', $esiHelper->DecodeDate($extraction->chunk_arrival_time))->toDateString();
|
||||||
|
//check if the dates are equal then increase the total by 1
|
||||||
|
if($tempStructureDate == $extractionDate) {
|
||||||
|
$structures[$i]['total'] += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach($structures as $structure) {
|
||||||
|
$calendar->addRow([
|
||||||
|
$structure['date'],
|
||||||
|
$structure['total'],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$lava->CalendarChart('Extractions', $calendar, [
|
||||||
|
'title' => 'Upcoming Extractions',
|
||||||
|
'unusedMonthOutlineColor' => [
|
||||||
|
'stroke' => '#ECECEC',
|
||||||
|
'strokeOpacity' => 0.75,
|
||||||
|
'strokeWidth' => 1,
|
||||||
|
],
|
||||||
|
'dayOfWeekLabel' => [
|
||||||
|
'color' => '#4f5b0d',
|
||||||
|
'fontSize' => 16,
|
||||||
|
'italic' => true,
|
||||||
|
],
|
||||||
|
'noDataPattern' => [
|
||||||
|
'color' => '#DDD',
|
||||||
|
'backgroundColor' => '#11FFFF',
|
||||||
|
],
|
||||||
|
'colorAxis' => [
|
||||||
|
'values' => [0, 5],
|
||||||
|
'colors' => ['green', 'red'],
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
//Return the view with the extractions variable for html processing
|
//Return the view with the extractions variable for html processing
|
||||||
return view('miningtax.user.display.upcoming')->with('structures', $structures);
|
return view('miningtax.user.display.upcoming')->with('structures', $structures);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,26 +1,6 @@
|
|||||||
@extends('layouts.user.dashb4')
|
@extends('layouts.user.dashb4')
|
||||||
@section('content')
|
@section('content')
|
||||||
<br>
|
<br>
|
||||||
<div class="container col-md-8">
|
|
||||||
<div class="row justify-content-center">
|
|
||||||
<div class="col-md-8">
|
|
||||||
<div class="card">
|
|
||||||
<div class="card-header">
|
|
||||||
Dashboard
|
|
||||||
</div>
|
|
||||||
<div class="card-body">
|
|
||||||
@if (session('status'))
|
|
||||||
<div class="alert alert-success" role="alert">
|
|
||||||
{{ session('status') }}
|
|
||||||
</div>
|
|
||||||
@endif
|
|
||||||
Welcome to the dashboard
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<br>
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
|
|||||||
@@ -1,6 +1,18 @@
|
|||||||
@extends('layouts.user.dashb4')
|
@extends('layouts.user.dashb4')
|
||||||
@section('content')
|
@section('content')
|
||||||
<br>
|
<br>
|
||||||
|
<div class="container">
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-header">
|
||||||
|
<h2>Mining Calendar</h2>
|
||||||
|
</div>
|
||||||
|
<div class="card-body">
|
||||||
|
<div id="extractions_div"></div>
|
||||||
|
{!! $lava->render('CalendarChart', 'Extractions', 'extractions_div') !!}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<br>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
|
|||||||
Reference in New Issue
Block a user