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

Add importers in console and admin for flights/aircraft/subfleets and airport #194

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-03-20 19:17:11 -05:00
parent 782121829a
commit b9beb6c804
41 changed files with 1270 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,9 +10,12 @@ use App\Models\Enums\AircraftStatus;
use App\Models\Expense;
use App\Models\Subfleet;
use App\Repositories\AircraftRepository;
use App\Services\ImporterService;
use Flash;
use Illuminate\Http\Request;
use Log;
use Prettus\Repository\Criteria\RequestCriteria;
use Storage;
/**
* Class AircraftController
@@ -20,16 +23,20 @@ use Prettus\Repository\Criteria\RequestCriteria;
*/
class AircraftController extends Controller
{
private $aircraftRepo;
private $aircraftRepo,
$importSvc;
/**
* AircraftController constructor.
* @param AircraftRepository $aircraftRepo
* @param ImporterService $importSvc
*/
public function __construct(
AircraftRepository $aircraftRepo
AircraftRepository $aircraftRepo,
ImporterService $importSvc
) {
$this->aircraftRepo = $aircraftRepo;
$this->importSvc = $importSvc;
}
/**
@@ -67,7 +74,6 @@ class AircraftController extends Controller
$aircraft = $this->aircraftRepo->create($attrs);
Flash::success('Aircraft saved successfully.');
return redirect(route('admin.aircraft.edit', ['id' => $aircraft->id]));
}
@@ -80,7 +86,6 @@ class AircraftController extends Controller
if (empty($aircraft)) {
Flash::error('Aircraft not found');
return redirect(route('admin.aircraft.index'));
}
@@ -119,7 +124,6 @@ class AircraftController extends Controller
if (empty($aircraft)) {
Flash::error('Aircraft not found');
return redirect(route('admin.aircraft.index'));
}
@@ -127,7 +131,6 @@ class AircraftController extends Controller
$this->aircraftRepo->update($attrs, $id);
Flash::success('Aircraft updated successfully.');
return redirect(route('admin.aircraft.index'));
}
@@ -140,17 +143,43 @@ class AircraftController extends Controller
if (empty($aircraft)) {
Flash::error('Aircraft not found');
return redirect(route('admin.aircraft.index'));
}
$this->aircraftRepo->delete($id);
Flash::success('Aircraft deleted successfully.');
return redirect(route('admin.aircraft.index'));
}
/**
*
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @throws \League\Csv\Exception
*/
public function import(Request $request)
{
$logs = [
'success' => [],
'failed' => [],
];
if ($request->isMethod('post')) {
$path = Storage::putFileAs(
'import', $request->file('csv_file'), 'aircraft'
);
$path = storage_path('app/'.$path);
Log::info('Uploaded flights import file to '.$path);
$logs = $this->importSvc->importAircraft($path);
}
return view('admin.aircraft.import', [
'logs' => $logs,
]);
}
/**
* @param Aircraft|null $aircraft
* @return mixed

41
app/Http/Controllers/Admin/AirportController.php
View File

@@ -9,10 +9,13 @@ use App\Models\Airport;
use App\Models\Expense;
use App\Repositories\AirportRepository;
use App\Repositories\Criteria\WhereCriteria;
use App\Services\ImporterService;
use Flash;
use Illuminate\Http\Request;
use Jackiedo\Timezonelist\Facades\Timezonelist;
use Log;
use Response;
use Storage;
/**
* Class AirportController
@@ -20,15 +23,19 @@ use Response;
*/
class AirportController extends Controller
{
private $airportRepo;
private $airportRepo,
$importSvc;
/**
* @param AirportRepository $airportRepo
* @param ImporterService $importSvc
*/
public function __construct(
AirportRepository $airportRepo
AirportRepository $airportRepo,
ImporterService $importSvc
) {
$this->airportRepo = $airportRepo;
$this->importSvc = $importSvc;
}
/**
@@ -162,17 +169,43 @@ class AirportController extends Controller
if (empty($airport)) {
Flash::error('Airport not found');
return redirect(route('admin.airports.index'));
}
$this->airportRepo->delete($id);
Flash::success('Airport deleted successfully.');
return redirect(route('admin.airports.index'));
}
/**
*
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @throws \League\Csv\Exception
*/
public function import(Request $request)
{
$logs = [
'success' => [],
'failed' => [],
];
if ($request->isMethod('post')) {
$path = Storage::putFileAs(
'import', $request->file('csv_file'), 'airports'
);
$path = storage_path('app/'.$path);
Log::info('Uploaded flights import file to '.$path);
$logs = $this->importSvc->importAirports($path);
}
return view('admin.airports.import', [
'logs' => $logs,
]);
}
/**
* @param Airport|null $airport
* @return mixed

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

@@ -17,11 +17,13 @@ use App\Repositories\FlightRepository;
use App\Repositories\SubfleetRepository;
use App\Services\FareService;
use App\Services\FlightService;
use App\Services\ImporterService;
use App\Support\Units\Time;
use Flash;
use Illuminate\Http\Request;
use Log;
use Response;
use Storage;
/**
* Class FlightController
@@ -36,6 +38,7 @@ class FlightController extends Controller
$flightFieldRepo,
$fareSvc,
$flightSvc,
$importSvc,
$subfleetRepo;
/**
@@ -44,9 +47,10 @@ class FlightController extends Controller
* @param AirportRepository $airportRepo
* @param FareRepository $fareRepo
* @param FlightRepository $flightRepo
* @param FlightFieldRepository $flightFieldRepository
* @param FlightFieldRepository $flightFieldRepo
* @param FareService $fareSvc
* @param FlightService $flightSvc
* @param ImporterService $importSvc
* @param SubfleetRepository $subfleetRepo
*/
public function __construct(
@@ -57,6 +61,7 @@ class FlightController extends Controller
FlightFieldRepository $flightFieldRepo,
FareService $fareSvc,
FlightService $flightSvc,
ImporterService $importSvc,
SubfleetRepository $subfleetRepo
) {
$this->airlineRepo = $airlineRepo;
@@ -66,6 +71,7 @@ class FlightController extends Controller
$this->flightFieldRepo = $flightFieldRepo;
$this->fareSvc = $fareSvc;
$this->flightSvc = $flightSvc;
$this->importSvc = $importSvc;
$this->subfleetRepo = $subfleetRepo;
}
@@ -304,6 +310,34 @@ class FlightController extends Controller
return redirect(route('admin.flights.index'));
}
/**
*
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @throws \League\Csv\Exception
*/
public function import(Request $request)
{
$logs = [
'success' => [],
'failed' => [],
];
if ($request->isMethod('post')) {
$path = Storage::putFileAs(
'import', $request->file('csv_file'), 'flights'
);
$path = storage_path('app/'.$path);
Log::info('Uploaded flights import file to '.$path);
$logs = $this->importSvc->importFlights($path);
}
return view('admin.flights.import', [
'logs' => $logs,
]);
}
/**
* @param $flight
* @return mixed

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

@@ -15,10 +15,13 @@ use App\Repositories\RankRepository;
use App\Repositories\SubfleetRepository;
use App\Services\FareService;
use App\Services\FleetService;
use App\Services\ImporterService;
use Flash;
use Illuminate\Http\Request;
use Log;
use Prettus\Repository\Criteria\RequestCriteria;
use Response;
use Storage;
/**
* Class SubfleetController
@@ -30,6 +33,7 @@ class SubfleetController extends Controller
$fareRepo,
$fareSvc,
$fleetSvc,
$importSvc,
$rankRepo,
$subfleetRepo;
@@ -37,23 +41,26 @@ class SubfleetController extends Controller
* SubfleetController constructor.
* @param AircraftRepository $aircraftRepo
* @param FleetService $fleetSvc
* @param RankRepository $rankRepo
* @param SubfleetRepository $subfleetRepo
* @param FareRepository $fareRepo
* @param FareService $fareSvc
* @param ImporterService $importSvc
* @param RankRepository $rankRepo
* @param SubfleetRepository $subfleetRepo
*/
public function __construct(
AircraftRepository $aircraftRepo,
FleetService $fleetSvc,
RankRepository $rankRepo,
SubfleetRepository $subfleetRepo,
FareRepository $fareRepo,
FareService $fareSvc
FareService $fareSvc,
ImporterService $importSvc,
RankRepository $rankRepo,
SubfleetRepository $subfleetRepo
) {
$this->aircraftRepo = $aircraftRepo;
$this->fareRepo = $fareRepo;
$this->fareSvc = $fareSvc;
$this->fleetSvc = $fleetSvc;
$this->importSvc = $importSvc;
$this->rankRepo = $rankRepo;
$this->subfleetRepo = $subfleetRepo;
}
@@ -133,7 +140,6 @@ class SubfleetController extends Controller
$subfleet = $this->subfleetRepo->create($input);
Flash::success('Subfleet saved successfully.');
return redirect(route('admin.subfleets.edit', ['id' => $subfleet->id]));
}
@@ -148,12 +154,10 @@ class SubfleetController extends Controller
if (empty($subfleet)) {
Flash::error('Subfleet not found');
return redirect(route('admin.subfleets.index'));
}
$avail_fares = $this->getAvailFares($subfleet);
return view('admin.subfleets.show', [
'subfleet' => $subfleet,
'avail_fares' => $avail_fares,
@@ -171,7 +175,6 @@ class SubfleetController extends Controller
if (empty($subfleet)) {
Flash::error('Subfleet not found');
return redirect(route('admin.subfleets.index'));
}
@@ -200,14 +203,12 @@ class SubfleetController extends Controller
if (empty($subfleet)) {
Flash::error('Subfleet not found');
return redirect(route('admin.subfleets.index'));
}
$this->subfleetRepo->update($request->all(), $id);
Flash::success('Subfleet updated successfully.');
return redirect(route('admin.subfleets.index'));
}
@@ -222,7 +223,6 @@ class SubfleetController extends Controller
if (empty($subfleet)) {
Flash::error('Subfleet not found');
return redirect(route('admin.subfleets.index'));
}
@@ -231,17 +231,43 @@ class SubfleetController extends Controller
$aircraft = $this->aircraftRepo->findWhere(['subfleet_id' => $id], ['id']);
if ($aircraft->count() > 0) {
Flash::error('There are aircraft still assigned to this subfleet, you can\'t delete it!')->important();
return redirect(route('admin.subfleets.index'));
}
$this->subfleetRepo->delete($id);
Flash::success('Subfleet deleted successfully.');
return redirect(route('admin.subfleets.index'));
}
/**
*
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @throws \League\Csv\Exception
*/
public function import(Request $request)
{
$logs = [
'success' => [],
'failed' => [],
];
if ($request->isMethod('post')) {
$path = Storage::putFileAs(
'import', $request->file('csv_file'), 'subfleets'
);
$path = storage_path('app/'.$path);
Log::info('Uploaded flights import file to '.$path);
$logs = $this->importSvc->importSubfleets($path);
}
return view('admin.subfleets.import', [
'logs' => $logs,
]);
}
/**
* @param Subfleet $subfleet
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
@@ -251,7 +277,6 @@ class SubfleetController extends Controller
$subfleet->refresh();
$avail_ranks = $this->getAvailRanks($subfleet);
return view('admin.subfleets.ranks', [
'subfleet' => $subfleet,
'avail_ranks' => $avail_ranks,
@@ -267,7 +292,6 @@ class SubfleetController extends Controller
$subfleet->refresh();
$avail_fares = $this->getAvailFares($subfleet);
return view('admin.subfleets.fares', [
'subfleet' => $subfleet,
'avail_fares' => $avail_fares,
@@ -321,7 +345,6 @@ class SubfleetController extends Controller
protected function return_expenses_view(?Subfleet $subfleet)
{
$subfleet->refresh();
return view('admin.subfleets.expenses', [
'subfleet' => $subfleet,
]);
@@ -377,7 +400,6 @@ class SubfleetController extends Controller
$subfleet = $this->subfleetRepo->findWithoutFail($id);
if (empty($subfleet)) {
return $this->return_fares_view($subfleet);
//return view('admin.aircraft.fares', ['fares' => []]);
}
if ($request->isMethod('get')) {