FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated subfleet admin design

Browse Source
This commit is contained in:
Nabeel Shahzad
2017-11-22 11:52:02 -06:00
parent 321f2e94f5
commit 5e990164ee
12 changed files with 131 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/php.xml generated
View File

@@ -5,7 +5,6 @@
<path value="$PROJECT_DIR$/vendor/infyomlabs/adminlte-templates" />
<path value="$PROJECT_DIR$/vendor/infyomlabs/laravel-generator" />
<path value="$PROJECT_DIR$/vendor/psr/log" />
<path value="$PROJECT_DIR$/vendor/infyomlabs/swagger-generator" />
<path value="$PROJECT_DIR$/vendor/symfony/yaml" />
<path value="$PROJECT_DIR$/vendor/composer" />
<path value="$PROJECT_DIR$/vendor/symfony/css-selector" />
@@ -28,7 +27,6 @@
<path value="$PROJECT_DIR$/vendor/sebastian/version" />
<path value="$PROJECT_DIR$/vendor/nesbot/carbon" />
<path value="$PROJECT_DIR$/vendor/laravelcollective/html" />
<path value="$PROJECT_DIR$/vendor/zircote/swagger-php" />
<path value="$PROJECT_DIR$/vendor/erusev/parsedown" />
<path value="$PROJECT_DIR$/vendor/prettus/laravel-validation" />
<path value="$PROJECT_DIR$/vendor/prettus/l5-repository" />
@@ -58,7 +56,6 @@
<path value="$PROJECT_DIR$/vendor/symfony/process" />
<path value="$PROJECT_DIR$/vendor/symfony/routing" />
<path value="$PROJECT_DIR$/vendor/hamcrest/hamcrest-php" />
<path value="$PROJECT_DIR$/vendor/jlapp/swaggervel" />
<path value="$PROJECT_DIR$/vendor/mockery/mockery" />
<path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
<path value="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer" />
@@ -120,6 +117,11 @@
<path value="$PROJECT_DIR$/vendor/egulias/email-validator" />
<path value="$PROJECT_DIR$/vendor/psr/container" />
<path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
<path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
<path value="$PROJECT_DIR$/vendor/filp/whoops" />
<path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
<path value="$PROJECT_DIR$/vendor/phar-io/version" />
<path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
</include_path>
</component>
<component name="PhpProjectServersManager">

32
app/Http/Controllers/Admin/SubfleetController.php
View File

@@ -20,6 +20,23 @@ class SubfleetController extends BaseController
/** @var SubfleetRepository */
private $subfleetRepo, $fareRepo;
/**
* SubfleetController constructor.
*
* @param SubfleetRepository $subfleetRepo
* @param FareRepository $fareRepo
*/
public function __construct(
SubfleetRepository $subfleetRepo,
FareRepository $fareRepo
) {
$this->subfleetRepo = $subfleetRepo;
$this->fareRepo = $fareRepo;
}
/**
* @return array
*/
protected function getFuelTypes()
{
$retval = [];
@@ -30,6 +47,9 @@ class SubfleetController extends BaseController
return $retval;
}
/**
* Get all the fares that haven't been assigned to a given subfleet
*/
protected function getAvailFares($subfleet)
{
$retval = [];
@@ -45,15 +65,6 @@ class SubfleetController extends BaseController
return $retval;
}
public function __construct(
SubfleetRepository $subfleetRepo,
FareRepository $fareRepo
)
{
$this->subfleetRepo = $subfleetRepo;
$this->fareRepo = $fareRepo;
}
/**
* Display a listing of the Subfleet.
*
@@ -214,7 +225,8 @@ class SubfleetController extends BaseController
$subfleet = $this->subfleetRepo->findWithoutFail($id);
if (empty($subfleet)) {
return view('admin.aircraft.fares', ['fares' => []]);
return $this->return_fares_view($subfleet);
//return view('admin.aircraft.fares', ['fares' => []]);
}
$fare_svc = app('App\Services\FareService');

6
composer.json
View File

@@ -37,14 +37,14 @@
"dg/rss-php": "1.2",
"makinacorpus/php-bloom": "dev-master",
"hashids/hashids": "2.0.*",
"maatwebsite/excel": "2.1.*"
"maatwebsite/excel": "2.1.*",
"symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.3.*"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "~6.0",
"symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.1.*",
"laravel/homestead": "v6.2.2",
"scriptfusion/phpunit-immediate-exception-printer": "^1",
"filp/whoops": "~2.0"

17
phpvms.iml
View File

@@ -14,12 +14,15 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/dompdf/dompdf" />
<excludeFolder url="file://$MODULE_DIR$/vendor/egulias/email-validator" />
<excludeFolder url="file://$MODULE_DIR$/vendor/ellipsesynergie/api-response" />
<excludeFolder url="file://$MODULE_DIR$/vendor/filp/whoops" />
<excludeFolder url="file://$MODULE_DIR$/vendor/hashids/hashids" />
<excludeFolder url="file://$MODULE_DIR$/vendor/jeremeamia/SuperClosure" />
<excludeFolder url="file://$MODULE_DIR$/vendor/league/fractal" />
<excludeFolder url="file://$MODULE_DIR$/vendor/maatwebsite/excel" />
<excludeFolder url="file://$MODULE_DIR$/vendor/makinacorpus/php-bloom" />
<excludeFolder url="file://$MODULE_DIR$/vendor/nikic/php-parser" />
<excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/manifest" />
<excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/version" />
<excludeFolder url="file://$MODULE_DIR$/vendor/phenx/php-font-lib" />
<excludeFolder url="file://$MODULE_DIR$/vendor/phenx/php-svg-lib" />
<excludeFolder url="file://$MODULE_DIR$/vendor/php-http/httplug" />
@@ -28,10 +31,12 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/psr/container" />
<excludeFolder url="file://$MODULE_DIR$/vendor/psr/simple-cache" />
<excludeFolder url="file://$MODULE_DIR$/vendor/scriptfusion/phpunit-immediate-exception-printer" />
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/object-reflector" />
<excludeFolder url="file://$MODULE_DIR$/vendor/spatie/fractalistic" />
<excludeFolder url="file://$MODULE_DIR$/vendor/spatie/laravel-fractal" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php56" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-util" />
<excludeFolder url="file://$MODULE_DIR$/vendor/theseer/tokenizer" />
<excludeFolder url="file://$MODULE_DIR$/vendor/webpatser/laravel-uuid" />
<excludeFolder url="file://$MODULE_DIR$/vendor/yajra/laravel-datatables-oracle" />
</content>
@@ -49,12 +54,15 @@
<root url="file://$MODULE_DIR$/vendor/dompdf/dompdf" />
<root url="file://$MODULE_DIR$/vendor/egulias/email-validator" />
<root url="file://$MODULE_DIR$/vendor/ellipsesynergie/api-response" />
<root url="file://$MODULE_DIR$/vendor/filp/whoops" />
<root url="file://$MODULE_DIR$/vendor/hashids/hashids" />
<root url="file://$MODULE_DIR$/vendor/jeremeamia/SuperClosure" />
<root url="file://$MODULE_DIR$/vendor/league/fractal" />
<root url="file://$MODULE_DIR$/vendor/maatwebsite/excel" />
<root url="file://$MODULE_DIR$/vendor/makinacorpus/php-bloom" />
<root url="file://$MODULE_DIR$/vendor/nikic/php-parser" />
<root url="file://$MODULE_DIR$/vendor/phar-io/manifest" />
<root url="file://$MODULE_DIR$/vendor/phar-io/version" />
<root url="file://$MODULE_DIR$/vendor/phenx/php-font-lib" />
<root url="file://$MODULE_DIR$/vendor/phenx/php-svg-lib" />
<root url="file://$MODULE_DIR$/vendor/php-http/httplug" />
@@ -63,10 +71,12 @@
<root url="file://$MODULE_DIR$/vendor/psr/container" />
<root url="file://$MODULE_DIR$/vendor/psr/simple-cache" />
<root url="file://$MODULE_DIR$/vendor/scriptfusion/phpunit-immediate-exception-printer" />
<root url="file://$MODULE_DIR$/vendor/sebastian/object-reflector" />
<root url="file://$MODULE_DIR$/vendor/spatie/fractalistic" />
<root url="file://$MODULE_DIR$/vendor/spatie/laravel-fractal" />
<root url="file://$MODULE_DIR$/vendor/symfony/polyfill-php56" />
<root url="file://$MODULE_DIR$/vendor/symfony/polyfill-util" />
<root url="file://$MODULE_DIR$/vendor/theseer/tokenizer" />
<root url="file://$MODULE_DIR$/vendor/webpatser/laravel-uuid" />
<root url="file://$MODULE_DIR$/vendor/yajra/laravel-datatables-oracle" />
</CLASSES>
@@ -82,12 +92,15 @@
<root url="file://$MODULE_DIR$/vendor/dompdf/dompdf" />
<root url="file://$MODULE_DIR$/vendor/egulias/email-validator" />
<root url="file://$MODULE_DIR$/vendor/ellipsesynergie/api-response" />
<root url="file://$MODULE_DIR$/vendor/filp/whoops" />
<root url="file://$MODULE_DIR$/vendor/hashids/hashids" />
<root url="file://$MODULE_DIR$/vendor/jeremeamia/SuperClosure" />
<root url="file://$MODULE_DIR$/vendor/league/fractal" />
<root url="file://$MODULE_DIR$/vendor/maatwebsite/excel" />
<root url="file://$MODULE_DIR$/vendor/makinacorpus/php-bloom" />
<root url="file://$MODULE_DIR$/vendor/nikic/php-parser" />
<root url="file://$MODULE_DIR$/vendor/phar-io/manifest" />
<root url="file://$MODULE_DIR$/vendor/phar-io/version" />
<root url="file://$MODULE_DIR$/vendor/phenx/php-font-lib" />
<root url="file://$MODULE_DIR$/vendor/phenx/php-svg-lib" />
<root url="file://$MODULE_DIR$/vendor/php-http/httplug" />
@@ -96,10 +109,12 @@
<root url="file://$MODULE_DIR$/vendor/psr/container" />
<root url="file://$MODULE_DIR$/vendor/psr/simple-cache" />
<root url="file://$MODULE_DIR$/vendor/scriptfusion/phpunit-immediate-exception-printer" />
<root url="file://$MODULE_DIR$/vendor/sebastian/object-reflector" />
<root url="file://$MODULE_DIR$/vendor/spatie/fractalistic" />
<root url="file://$MODULE_DIR$/vendor/spatie/laravel-fractal" />
<root url="file://$MODULE_DIR$/vendor/symfony/polyfill-php56" />
<root url="file://$MODULE_DIR$/vendor/symfony/polyfill-util" />
<root url="file://$MODULE_DIR$/vendor/theseer/tokenizer" />
<root url="file://$MODULE_DIR$/vendor/webpatser/laravel-uuid" />
<root url="file://$MODULE_DIR$/vendor/yajra/laravel-datatables-oracle" />
</SOURCES>
@@ -109,10 +124,12 @@
<library name="PHARS">
<CLASSES>
<root url="phar://$MODULE_DIR$/vendor/phpunit/phpunit/tests/_files/phpunit-example-extension/tools/phpunit.d/phpunit-example-extension-1.0.0.phar/" />
<root url="phar://$MODULE_DIR$/vendor/phar-io/manifest/tests/_fixture/test.phar/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="phar://$MODULE_DIR$/vendor/phpunit/phpunit/tests/_files/phpunit-example-extension/tools/phpunit.d/phpunit-example-extension-1.0.0.phar/" />
<root url="phar://$MODULE_DIR$/vendor/phar-io/manifest/tests/_fixture/test.phar/" />
</SOURCES>
</library>
</orderEntry>

6
resources/views/admin/app.blade.php
View File

@@ -101,8 +101,10 @@
<div class="content">
<div class="container-fluid">
<div class="row">
@include('flash::message')
@yield('content')
<div class="col-12">
@include('flash::message')
@yield('content')
</div>
</div>
</div>
</div>

50
resources/views/admin/subfleets/edit.blade.php
View File

@@ -1,36 +1,28 @@
@extends('admin.app')
@section('title', "Edit $subfleet->name")
@section('content')
<section class="content-header">
<h1>Edit {!! $subfleet->name !!}</h1>
</section>
<div class="content">
@include('adminlte-templates::common.errors')
<div class="box box-primary">
<div class="box-body">
<div class="row">
{!! Form::model($subfleet, ['route' => ['admin.subfleets.update', $subfleet->id], 'method' => 'patch']) !!}
@include('admin.subfleets.fields')
{!! Form::close() !!}
</div>
</div>
@include('adminlte-templates::common.errors')
<div class="card border-blue-bottom">
<div class="content">
{!! Form::model($subfleet, ['route' => ['admin.subfleets.update', $subfleet->id], 'method' => 'patch']) !!}
@include('admin.subfleets.fields')
{!! Form::close() !!}
</div>
<div class="box box-primary">
<div class="box-body">
<div class="row">
<div class="col-xs-12">
<h3>fares</h3>
<div class="box-body">
<div class="callout callout-info">
<i class="icon fa fa-info">&nbsp;&nbsp;</i>
Fares assigned to the current subfleet. These can be overridden,
otherwise, the value used is the default, which comes from the fare.
</div>
@include('admin.subfleets.fares')
</div>
</div>
</div>
<div class="card border-blue-bottom">
<div class="header">
<h3>fares</h3>
<p class="category">
<i class="icon fa fa-info">&nbsp;&nbsp;</i>
Fares assigned to the current subfleet. These can be overridden,
otherwise, the value used is the default, which comes from the fare.
</p>
</div>
<div class="content">
<div class="row">
<div class="col-xs-12">
@include('admin.subfleets.fares')
</div>
</div>
</div>

22
resources/views/admin/subfleets/fares.blade.php
View File

@@ -1,3 +1,4 @@
{{--<div class="row"> <div class="col-12">--}}
<div id="aircraft_fares_wrapper" class="dataTables_wrapper form-inline dt-bootstrap">
<table id="aircraft_fares"
class="table table-bordered table-hover dataTable"
@@ -35,7 +36,7 @@
</thead>
<tbody>
@foreach($subfleet->fares as $atf)
<tr role="row" class="@if ($loop->iteration%2) even @else odd @endif">
<tr role="row" class="@if ($loop->iteration % 2) even @else odd @endif">
<td class="sorting_1">{!! $atf->name !!}</td>
<td>{!! $atf->code !!}</td>
<td><a href="#" data-pk="{!! $atf->id !!}" data-name="capacity">{!! $atf->pivot->capacity !!}</a>
@@ -46,14 +47,16 @@
<td><a href="#" data-pk="{!! $atf->id !!}" data-name="cost">{!! $atf->pivot->cost !!}</a>
<span class="small background-color-grey-light">({!! $atf->cost!!})</span></td>
<td style="text-align: right; width:3%;">
<div class='btn-group'>
{!! Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/fares', 'method' => 'delete', 'class' => 'rm_fare']) !!}
{!! Form::hidden('fare_id', $atf->id) !!}
{!! Form::button('<i class="glyphicon glyphicon-trash"></i>',
['type' => 'submit',
'class' => 'btn btn-danger btn-s']) !!}
{!! Form::close() !!}
</div>
{!! Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/fares',
'method' => 'delete',
'class' => 'rm_fare'
])
!!}
{!! Form::hidden('fare_id', $atf->id) !!}
{!! Form::button('<i class="fa fa-times"></i>',
['type' => 'submit',
'class' => 'btn btn-sm btn-danger btn-icon']) !!}
{!! Form::close() !!}
</td>
</tr>
@endforeach
@@ -82,3 +85,4 @@
</div>
</div>
</div>
{{--</div></div>--}}

47
resources/views/admin/subfleets/fields.blade.php
View File

@@ -1,31 +1,28 @@
<!-- Airline Id Field -->
<div class="form-group col-sm-6">
{!! Form::label('airline_id', 'Airline:') !!}
{!! Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) !!}
</div>
<div class="row">
<div class="form-group col-sm-6">
{!! Form::label('airline_id', 'Airline:') !!}
{!! Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) !!}
</div>
<!-- Name Field -->
<div class="form-group col-sm-6">
{!! Form::label('name', 'Name:') !!}
{!! Form::text('name', null, ['class' => 'form-control']) !!}
</div>
<div class="form-group col-sm-6">
{!! Form::label('name', 'Name:') !!}
{!! Form::text('name', null, ['class' => 'form-control']) !!}
</div>
<!-- Type Field -->
<div class="form-group col-sm-6">
{!! Form::label('type', 'Type:') !!}
{!! Form::text('type', null, ['class' => 'form-control']) !!}
</div>
<div class="form-group col-sm-6">
{!! Form::label('type', 'Type:') !!}
{!! Form::text('type', null, ['class' => 'form-control']) !!}
</div>
<!-- Fuel Type Field -->
<div class="form-group col-sm-6">
{!! Form::label('fuel_type', 'Fuel Type:') !!}
{!! Form::select('fuel_type', $fuel_types, null , ['class' => 'form-control select2']) !!}
</div>
<div class="form-group col-sm-6">
{!! Form::label('fuel_type', 'Fuel Type:') !!}
{!! Form::select('fuel_type', $fuel_types, null , ['class' => 'form-control select2']) !!}
</div>
<!-- Submit Field -->
<div class="form-group col-sm-12">
<div class="pull-right">
{!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
<a href="{!! route('admin.subfleets.index') !!}" class="btn btn-default">Cancel</a>
<div class="form-group col-sm-12">
<div class="pull-right">
{!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
<a href="{!! route('admin.subfleets.index') !!}" class="btn btn-default">Cancel</a>
</div>
</div>
</div>

26
resources/views/admin/subfleets/index.blade.php
View File

@@ -1,23 +1,17 @@
@extends('admin.app')
@section('title', 'Subfleets')
@section('actions')
<li>
<a href="{!! route('admin.subfleets.create') !!}">
<i class="ti-plus"></i>Add New</a>
</li>
@endsection
@section('content')
<section class="content-header">
<h1 class="pull-left">Subfleets</h1>
<h1 class="pull-right">
<a class="btn btn-primary pull-right" style="margin-top: -10px;margin-bottom: 5px" href="{!! route('admin.subfleets.create') !!}">Add New</a>
</h1>
</section>
<div class="content">
<div class="clearfix"></div>
<div class="card">
@include('flash::message')
<div class="clearfix"></div>
<div class="box box-primary">
<div class="box-body">
@include('admin.subfleets.table')
</div>
</div>
@include('admin.subfleets.table')
</div>
@endsection

4
resources/views/admin/subfleets/script.blade.php
View File

@@ -22,6 +22,10 @@ $(document).ready(function() {
event.preventDefault();
$.pjax.submit(event, '#aircraft_fares_wrapper', {push: false});
});
$(document).on('pjax:complete', function() {
$(".select2").select2();
});
});
</script>
@endsection

14
resources/views/admin/subfleets/table.blade.php
View File

@@ -1,3 +1,4 @@
<div class="content table-responsive table-full-width">
<table class="table table-hover table-responsive" id="subfleets-table">
<thead>
<th>Airline</th>
@@ -25,14 +26,17 @@
</td>
<td class="text-right">
{!! Form::open(['route' => ['admin.subfleets.destroy', $subfleet->id], 'method' => 'delete']) !!}
<div class='btn-group'>
<a href="{!! route('admin.subfleets.show', [$subfleet->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-eye-open"></i></a>
<a href="{!! route('admin.subfleets.edit', [$subfleet->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-edit"></i></a>
{!! Form::button('<i class="glyphicon glyphicon-trash"></i>', ['type' => 'submit', 'class' => 'btn btn-danger btn-xs', 'onclick' => "return confirm('Are you sure?')"]) !!}
</div>
<a href="{!! route('admin.subfleets.edit', [$subfleet->id]) !!}" class='btn btn-sm btn-success btn-icon'>
<i class="fa fa-pencil-square-o"></i></a>
{!! Form::button('<i class="fa fa-times"></i>',
['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon',
'onclick' => "return confirm('Are you sure?')"]) !!}
{!! Form::close() !!}
</td>
</tr>
@endforeach
</tbody>
</table>
</div>

2
tests/FlightTest.php
View File

@@ -21,7 +21,7 @@ class FlightTest extends TestCase
return $flight->id;
}
public function XtestGetFlight()
public function testGetFlight()
{
$flight_id = $this->addFlight();
$response = $this->json('GET', '/api/flight/'.$flight_id);