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

Add addtl fields to pirep - block_off and block_on times, calculate block_off time if not there

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-04-04 13:03:10 -05:00
parent 052813ba4a
commit e27f6f1b14
12 changed files with 130 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/Http/Controllers/Api/PirepController.php
View File

@@ -35,6 +35,7 @@ use App\Services\GeoService;
use App\Services\PirepService;
use App\Services\UserService;
use Auth;
use Carbon\Carbon;
use Illuminate\Http\Request;
use Log;
@@ -237,7 +238,7 @@ class PirepController extends Controller
Log::info('PIREP Update, user '.Auth::id(), $request->post());
$user = Auth::user();
$pirep = $this->pirepRepo->find($id);
$pirep = Pirep::find($id);
$this->checkCancelled($pirep);
$attrs = $request->post();
@@ -277,7 +278,7 @@ class PirepController extends Controller
$user = Auth::user();
# Check if the status is cancelled...
$pirep = $this->pirepRepo->find($id);
$pirep = Pirep::find($id);
$this->checkCancelled($pirep);
$attrs = $request->post();
@@ -294,9 +295,11 @@ class PirepController extends Controller
$attrs['state'] = PirepState::PENDING;
$attrs['status'] = PirepStatus::ARRIVED;
$attrs['submitted_at'] = Carbon::now('UTC');
$pirep = $this->pirepRepo->update($attrs, $id);
try {
$pirep = $this->pirepRepo->update($attrs, $id);
$pirep = $this->pirepSvc->create($pirep);
$this->updateFields($pirep, $request);
$this->updateFares($pirep, $request);
@@ -343,7 +346,7 @@ class PirepController extends Controller
*/
public function acars_geojson($id, Request $request)
{
$pirep = $this->pirepRepo->find($id);
$pirep = Pirep::find($id);
$geodata = $this->geoSvc->getFeatureFromAcars($pirep);
return response(\json_encode($geodata), 200, [
@@ -378,7 +381,7 @@ class PirepController extends Controller
public function acars_store($id, PositionRequest $request)
{
# Check if the status is cancelled...
$pirep = $this->pirepRepo->find($id);
$pirep = Pirep::find($id);
$this->checkCancelled($pirep);
Log::debug(
@@ -420,7 +423,7 @@ class PirepController extends Controller
public function acars_logs($id, LogRequest $request)
{
# Check if the status is cancelled...
$pirep = $this->pirepRepo->find($id);
$pirep = Pirep::find($id);
$this->checkCancelled($pirep);
Log::debug('Posting ACARS log, PIREP: '.$id, $request->post());
@@ -451,7 +454,7 @@ class PirepController extends Controller
public function acars_events($id, EventRequest $request)
{
# Check if the status is cancelled...
$pirep = $this->pirepRepo->find($id);
$pirep = Pirep::find($id);
$this->checkCancelled($pirep);
Log::debug('Posting ACARS event, PIREP: '.$id, $request->post());
@@ -479,8 +482,7 @@ class PirepController extends Controller
*/
public function comments_get($id, Request $request)
{
$pirep = $this->pirepRepo->find($id);
$pirep = Pirep::find($id);
return PirepCommentResource::collection($pirep->comments);
}
@@ -493,7 +495,7 @@ class PirepController extends Controller
*/
public function comments_post($id, CommentRequest $request)
{
$pirep = $this->pirepRepo->find($id);
$pirep = Pirep::find($id);
$this->checkCancelled($pirep);
Log::debug('Posting comment, PIREP: '.$id, $request->post());
@@ -516,9 +518,8 @@ class PirepController extends Controller
*/
public function finances_get($id, Request $request)
{
$pirep = $this->pirepRepo->find($id);
$pirep = Pirep::find($id);
$transactions = $this->journalRepo->getAllForObject($pirep);
return JournalTransactionResource::collection($transactions);
}
@@ -533,12 +534,12 @@ class PirepController extends Controller
*/
public function finances_recalculate($id, Request $request)
{
$pirep = $this->pirepRepo->find($id);
$pirep = Pirep::find($id);
$this->financeSvc->processFinancesForPirep($pirep);
$pirep->refresh();
$transactions = $this->journalRepo->getAllForObject($pirep);
$transactions = $this->journalRepo->getAllForObject($pirep);
return JournalTransactionResource::collection($transactions['transactions']);
}
@@ -549,8 +550,7 @@ class PirepController extends Controller
*/
public function route_get($id, Request $request)
{
$this->pirepRepo->find($id);
$pirep = Pirep::find($id);
return AcarsRouteResource::collection(Acars::where([
'pirep_id' => $id,
'type' => AcarsType::ROUTE
@@ -568,7 +568,7 @@ class PirepController extends Controller
public function route_post($id, RouteRequest $request)
{
# Check if the status is cancelled...
$pirep = $this->pirepRepo->find($id);
$pirep = Pirep::find($id);
$this->checkCancelled($pirep);
Log::info('Posting ROUTE, PIREP: '.$id, $request->post());
@@ -596,7 +596,7 @@ class PirepController extends Controller
*/
public function route_delete($id, Request $request)
{
$this->pirepRepo->find($id);
$pirep = Pirep::find($id);
Acars::where([
'pirep_id' => $id,

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

@@ -21,6 +21,7 @@ use App\Services\GeoService;
use App\Services\PirepService;
use App\Services\UserService;
use App\Support\Units\Time;
use Carbon\Carbon;
use Flash;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
@@ -283,6 +284,9 @@ class PirepController extends Controller
$minutes = (int) $request->input('minutes', 0);
$pirep->flight_time = Utils::hoursToMinutes($hours) + $minutes;
// Put the time that this is currently submitted
$attrs['submitted_at'] = Carbon::now('UTC');
$pirep = $this->pirepSvc->create($pirep);
$this->saveCustomFields($pirep, $request);
$this->saveFares($pirep, $request);

2
app/Http/Requests/Acars/FileRequest.php
View File

@@ -41,7 +41,7 @@ class FileRequest extends FormRequest
'block_fuel' => 'nullable|numeric',
'route' => 'nullable',
'notes' => 'nullable',
'source_name' => 'nullable|max:25',
'source_name' => 'nullable',
'landing_rate' => 'nullable|numeric',
'flight_type' => 'nullable|integer',
'block_off_time' => 'nullable|date',

2
app/Http/Requests/Acars/PrefileRequest.php
View File

@@ -23,7 +23,7 @@ class PrefileRequest extends FormRequest
'flight_number' => 'required',
'dpt_airport_id' => 'required',
'arr_airport_id' => 'required',
'source_name' => 'required|max:25',
'source_name' => 'required',
'level' => 'nullable|numeric',
'route_code' => 'nullable',

3
app/Http/Requests/Acars/UpdateRequest.php
View File

@@ -31,7 +31,7 @@ class UpdateRequest extends FormRequest
'route_leg' => 'nullable',
'distance' => 'nullable|numeric',
'planned_distance' => 'nullable|numeric',
'block_time' => 'nullable|integer',
'block_time' => 'nullable|integer',
'flight_time' => 'nullable|integer',
'planned_flight_time' => 'nullable|integer',
'level' => 'nullable|numeric',
@@ -47,6 +47,7 @@ class UpdateRequest extends FormRequest
'block_on_time' => 'nullable|date',
'created_at' => 'nullable|date',
'status' => 'nullable',
'source_name' => 'nullable',
# See if the fare objects are included and formatted properly
'fares' => 'nullable|array',