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

#32 assign aircraft to subfleets, and aircraft to subfleets

Browse Source
This commit is contained in:
Nabeel Shahzad
2017-06-23 17:33:18 -05:00
parent b9d49a4af9
commit c3e417429a
27 changed files with 113 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Admin/AircraftController.php
View File

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin;
use App\Models\Subfleet;
use App\Http\Requests\CreateAircraftRequest;
use App\Http\Requests\UpdateAircraftRequest;
use App\Repositories\AircraftRepository;
use App\Repositories\SubfleetRepository;
use App\Repositories\FareRepository;
use Illuminate\Http\Request;
use Flash;
@@ -14,7 +14,7 @@ use Response;
class AircraftController extends BaseController
{
/** @var AircraftRepository */
/** @var SubfleetRepository */
private $aircraftRepository, $fareRepository;
protected function getAvailFares($aircraft)
@@ -32,7 +32,7 @@ class AircraftController extends BaseController
return $retval;
}
public function __construct(AircraftRepository $aircraftRepo, FareRepository $fareRepo)
public function __construct(SubfleetRepository $aircraftRepo, FareRepository $fareRepo)
{
$this->fareRepository = $fareRepo;
$this->aircraftRepository = $aircraftRepo;
@@ -126,7 +126,6 @@ class AircraftController extends BaseController
$aircraft = $this->aircraftRepository->update($request->all(), $id);
Flash::success('Aircraft updated successfully.');
return redirect(route('admin.aircraft.index'));
}

39
app/Http/Controllers/Admin/FlightController.php
View File

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin;
use App\Http\Requests\CreateFlightRequest;
use App\Http\Requests\UpdateFlightRequest;
use App\Repositories\FlightRepository;
use App\Repositories\AircraftRepository;
use App\Repositories\SubfleetRepository;
use Illuminate\Http\Request;
use Flash;
use Prettus\Repository\Criteria\RequestCriteria;
@@ -14,27 +14,27 @@ use Response;
class FlightController extends BaseController
{
/** @var FlightRepository */
private $flightRepository, $aircraftRepository;
private $flightRepository, $subfleetRepo;
public function __construct(
FlightRepository $flightRepo,
AircraftRepository $aircraftRepository
SubfleetRepository $subfleetRepo
)
{
$this->flightRepository = $flightRepo;
$this->aircraftRepository = $aircraftRepository;
$this->subfleetRepo = $subfleetRepo;
}
protected function getAvailAircraft($flight)
protected function getAvailSubfleets($flight)
{
$retval = [];
$flight->refresh();
$all_aircraft = $this->aircraftRepository->all();
$avail_aircraft = $all_aircraft->except($flight->aircraft->modelKeys());
$all_aircraft = $this->subfleetRepo->all();
$avail_fleets = $all_aircraft->except($flight->subfleets->modelKeys());
foreach ($avail_aircraft as $ac) {
$retval[$ac->id] = $ac->icao.' - '.$ac->registration;
foreach ($avail_fleets as $ac) {
$retval[$ac->id] = $ac->type.' - '.$ac->name;
}
return $retval;
@@ -98,10 +98,10 @@ class FlightController extends BaseController
return redirect(route('admin.flights.index'));
}
$avail_aircraft = $this->getAvailAircraft($flight);
$avail_subfleets = $this->getAvailSubfleets($flight);
return view('admin.flights.show')
->with('flight', $flight)
->with('avail_aircraft', $avail_aircraft);
->with('avail_subfleets', $avail_subfleets);
}
/**
@@ -143,7 +143,6 @@ class FlightController extends BaseController
$flight = $this->flightRepository->update($request->all(), $id);
Flash::success('Flight updated successfully.');
return redirect(route('admin.flights.index'));
}
@@ -169,15 +168,15 @@ class FlightController extends BaseController
return redirect(route('admin.flights.index'));
}
protected function return_aircraft_view($flight)
protected function return_subfleet_view($flight)
{
$avail_aircraft = $this->getAvailAircraft($flight);
return view('admin.flights.aircraft')
$avail_subfleets = $this->getAvailSubfleets($flight);
return view('admin.flights.subfleets')
->with('flight', $flight)
->with('avail_aircraft', $avail_aircraft);
->with('avail_subfleets', $avail_subfleets);
}
public function aircraft(Request $request)
public function subfleets(Request $request)
{
$id = $request->id;
@@ -189,14 +188,14 @@ class FlightController extends BaseController
// add aircraft to flight
if ($request->isMethod('post')) {
$flight->aircraft()->syncWithoutDetaching([$request->aircraft_id]);
$flight->subfleets()->syncWithoutDetaching([$request->subfleet_id]);
}
// remove aircraft from flight
elseif ($request->isMethod('delete')) {
$flight->aircraft()->detach($request->aircraft_id);
$flight->subfleets()->detach($request->subfleet_id);
}
return $this->return_aircraft_view($flight);
return $this->return_subfleet_view($flight);
}
}

30
app/Http/Requests/CreateAircraftClassRequest.php
View File

@@ -1,30 +0,0 @@
<?php
namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use App\Models\AircraftClass;
class CreateAircraftClassRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return AircraftClass::$rules;
}
}

4
app/Http/Requests/CreateAirportRequest.php
View File

@@ -2,10 +2,10 @@
namespace App\Http\Requests;
use App\Http\Requests\Request;
use App\Models\Airport;
use Illuminate\Foundation\Http\FormRequest;
class CreateAirportRequest extends Request
class CreateAirportRequest extends FormRequest
{
/**

4
app/Http/Requests/CreateFlightRequest.php
View File

@@ -2,10 +2,10 @@
namespace App\Http\Requests;
use App\Http\Requests\Request;
use App\Models\Flight;
use Illuminate\Foundation\Http\FormRequest;
class CreateFlightRequest extends Request
class CreateFlightRequest extends FormRequest
{
/**

4
app/Http/Requests/CreateRankRequest.php
View File

@@ -2,10 +2,10 @@
namespace App\Http\Requests;
use App\Http\Requests\Request;
use App\Models\Rank;
use Illuminate\Foundation\Http\FormRequest;
class CreateRankRequest extends Request
class CreateRankRequest extends FormRequest
{
/**

4
app/Http/Requests/CreateSubfleetRequest.php
View File

@@ -2,10 +2,10 @@
namespace App\Http\Requests;
use App\Http\Requests\Request;
use App\Models\Subfleet;
use Illuminate\Foundation\Http\FormRequest;
class CreateSubfleetRequest extends Request
class CreateSubfleetRequest extends FormRequest
{
/**

30
app/Http/Requests/UpdateAircraftClassRequest.php
View File

@@ -1,30 +0,0 @@
<?php
namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use App\Models\AircraftClass;
class UpdateAircraftClassRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return AircraftClass::$rules;
}
}

4
app/Http/Requests/UpdateAirportRequest.php
View File

@@ -2,10 +2,10 @@
namespace App\Http\Requests;
use App\Http\Requests\Request;
use App\Models\Airport;
use Illuminate\Foundation\Http\FormRequest;
class UpdateAirportRequest extends Request
class UpdateAirportRequest extends FormRequest
{
/**

4
app/Http/Requests/UpdateFlightRequest.php
View File

@@ -2,10 +2,10 @@
namespace App\Http\Requests;
use App\Http\Requests\Request;
use App\Models\Flight;
use Illuminate\Foundation\Http\FormRequest;
class UpdateFlightRequest extends Request
class UpdateFlightRequest extends FormRequest
{
/**

4
app/Http/Requests/UpdateRankRequest.php
View File

@@ -2,10 +2,10 @@
namespace App\Http\Requests;
use App\Http\Requests\Request;
use App\Models\Rank;
use Illuminate\Foundation\Http\FormRequest;
class UpdateRankRequest extends Request
class UpdateRankRequest extends FormRequest
{
/**

4
app/Http/Requests/UpdateSubfleetRequest.php
View File

@@ -2,10 +2,10 @@
namespace App\Http\Requests;
use App\Http\Requests\Request;
use App\Models\Subfleet;
use Illuminate\Foundation\Http\FormRequest;
class UpdateSubfleetRequest extends Request
class UpdateSubfleetRequest extends FormRequest
{
/**

2
app/Models/Aircraft.php
View File

@@ -18,7 +18,7 @@ class Aircraft extends Model
public $fillable
= [
'aircraft_class_id',
'subfleet_id',
'icao',
'name',
'registration',

4
app/Models/Flight.php
View File

@@ -81,8 +81,8 @@ class Flight extends Model
return $this->belongsTo('App\Models\Airport', 'alt_airport_id');
}
public function aircraft()
public function subfleets()
{
return $this->belongsToMany('App\Models\Aircraft', 'flight_aircraft');
return $this->belongsToMany('App\Models\Subfleet', 'subfleet_flight');
}
}

5
app/Models/Subfleet.php
View File

@@ -50,6 +50,11 @@ class Subfleet extends Model
return $this->belongsTo('App\Models\Airline', 'airline_id');
}
public function flights()
{
return $this->belongsToMany('App\Models\Flight', 'subfleet_flight');
}
public function ranks()
{
return $this->belongsToMany(

2
app/Services/AircraftService.php
View File

@@ -13,7 +13,7 @@ class AircraftService extends BaseService
AircraftClass $class = null
) {
$repo = app('App\Repositories\AircraftRepository');
$repo = app('App\Repositories\SubfleetRepository');
try {
$model = $repo->create($attributes);
} catch (Exception $e) {

4
app/Services/PIREPService.php
View File

@@ -2,7 +2,7 @@
namespace App\Services;
use App\Repositories\AircraftRepository;
use App\Repositories\SubfleetRepository;
class PIREPService extends BaseService {
@@ -13,7 +13,7 @@ class PIREPService extends BaseService {
* return a PIREP model
*/
public function __construct(
AircraftRepository $aircraft
SubfleetRepository $aircraft
) {
$this->aircraft = $aircraft;
}