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

#355 Calculate distance button (#366)

Browse Source 
* #355 Calculate distance button in add/edit Flight page

* Styling

* Move add/edit flight logic out of controller and into service layer

* Styling

* Formatting

* Run styleci against modules dir

* Styleci config

* Style fixes in /modules
This commit is contained in:
Nabeel S
2019-08-26 12:32:46 -04:00
committed by GitHub
parent 25999d55a3
commit bbec276da8
57 changed files with 9819 additions and 7522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Admin;
use App\Contracts\Controller;
use App\Http\Requests\CreateFlightRequest;
use App\Http\Requests\UpdateFlightRequest;
use App\Models\Enums\Days;
use App\Models\Enums\FlightType;
use App\Models\Flight;
use App\Models\FlightField;
@@ -22,11 +21,9 @@ use App\Services\FleetService;
use App\Services\FlightService;
use App\Services\ImportService;
use App\Support\Units\Time;
use Flash;
use Illuminate\Http\Request;
use Log;
use Response;
use Storage;
use Illuminate\Support\Facades\Log;
use Laracasts\Flash\Flash;
/**
* Class FlightController
@@ -172,28 +169,15 @@ class FlightController extends Controller
*/
public function store(CreateFlightRequest $request)
{
$input = $request->all();
try {
$flight = $this->flightSvc->createFlight($request->all());
Flash::success('Flight saved successfully.');
// Create a temporary flight so we can validate
$flight = new Flight($input);
if ($this->flightSvc->isFlightDuplicate($flight)) {
Flash::error('Duplicate flight with same number/code/leg found, please change to proceed');
return redirect(route('admin.flights.edit', $flight->id));
} catch (\Exception $e) {
Flash::error($e->getMessage());
return redirect()->back()->withInput($request->all());
}
if (array_key_exists('days', $input) && filled($input['days'])) {
$input['days'] = Days::getDaysMask($input['days']);
}
$input['active'] = get_truth_state($input['active']);
$time = new Time($input['minutes'], $input['hours']);
$input['flight_time'] = $time->getMinutes();
$flight = $this->flightRepo->create($input);
Flash::success('Flight saved successfully.');
return redirect(route('admin.flights.edit', $flight->id));
}
/**
@@ -268,32 +252,16 @@ class FlightController extends Controller
return redirect(route('admin.flights.index'));
}
$input = $request->all();
try {
$this->flightSvc->updateFlight($flight, $request->all());
Flash::success('Flight updated successfully.');
// apply the updates here temporarily, don't save
// the repo->update() call will actually do it
$flight->fill($input);
return redirect(route('admin.flights.index'));
} catch (\Exception $e) {
Flash::error($e->getMessage());
if ($this->flightSvc->isFlightDuplicate($flight)) {
Flash::error('Duplicate flight with same number/code/leg found, please change to proceed');
return redirect()->back()->withInput($request->all());
}
if (array_key_exists('days', $input) && filled($input['days'])) {
$input['days'] = Days::getDaysMask($input['days']);
}
$input['flight_time'] = Time::init(
$input['minutes'],
$input['hours']
)->getMinutes();
$input['active'] = get_truth_state($input['active']);
$this->flightRepo->update($input, $id);
Flash::success('Flight updated successfully.');
return redirect(route('admin.flights.index'));
}
/**