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

Major refactoring for PIREP statuses and states to accomodate ACARS/route data

Browse Source
This commit is contained in:
Nabeel Shahzad
2017-12-19 20:19:36 -06:00
parent ac4958a2be
commit 0375bb420f
38 changed files with 352 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;
use App\Http\Requests\CreatePirepRequest;
use App\Http\Requests\UpdatePirepRequest;
use App\Models\Enums\PirepState;
use App\Repositories\AircraftRepository;
use App\Repositories\AirlineRepository;
use App\Repositories\AirportRepository;
@@ -81,7 +82,7 @@ class PirepController extends BaseController
$this->pirepRepo->pushCriteria($criterea);
$pireps = $this->pirepRepo
->findWhere(['status' => config('enums.pirep_status.PENDING')])
->findWhere(['status' => PirepState::PENDING])
->orderBy('created_at', 'desc')
->paginate();
@@ -211,12 +212,12 @@ class PirepController extends BaseController
*/
public function status(Request $request)
{
Log::info('PIREP status update call', [$request->toArray()]);
Log::info('PIREP state update call', [$request->toArray()]);
$pirep = $this->pirepRepo->findWithoutFail($request->id);
if($request->isMethod('post')) {
$new_status = (int) $request->new_status;
$pirep = $this->pirepSvc->changeStatus($pirep, $new_status);
$pirep = $this->pirepSvc->changeState($pirep, $new_status);
}
$pirep->refresh();

3
app/Http/Controllers/Frontend/PirepController.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Frontend;
use App\Facades\Utils;
use App\Models\Enums\PirepSource;
use App\Repositories\Criteria\WhereCriteria;
use App\Services\PIREPService;
use Illuminate\Support\Facades\Auth;
@@ -95,7 +96,7 @@ class PirepController extends Controller
$custom_fields[] = [
'name' => $cfield->name,
'value' => $field_val,
'source' => config('enums.sources.MANUAL')
'source' => PirepSource::MANUAL
];
}