Fix PIREP field error on file
This commit is contained in:
@@ -132,7 +132,6 @@ class Handler extends ExceptionHandler
|
|||||||
{
|
{
|
||||||
if ($request->expectsJson() || $request->is('api/*')) {
|
if ($request->expectsJson() || $request->is('api/*')) {
|
||||||
$error = $this->createError(401, 'Unauthenticated');
|
$error = $this->createError(401, 'Unauthenticated');
|
||||||
|
|
||||||
return response()->json($error, 401);
|
return response()->json($error, 401);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -159,8 +158,8 @@ class Handler extends ExceptionHandler
|
|||||||
'exception' => $e,
|
'exception' => $e,
|
||||||
'SKIN_NAME' => config('phpvms.skin'),
|
'SKIN_NAME' => config('phpvms.skin'),
|
||||||
], $status, $e->getHeaders());
|
], $status, $e->getHeaders());
|
||||||
} else {
|
|
||||||
return $this->convertExceptionToResponse($e);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return $this->convertExceptionToResponse($e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -489,6 +489,7 @@ class PirepController extends Controller
|
|||||||
* @return \Illuminate\Http\JsonResponse
|
* @return \Illuminate\Http\JsonResponse
|
||||||
* @throws \App\Exceptions\PirepCancelled
|
* @throws \App\Exceptions\PirepCancelled
|
||||||
* @throws \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
|
* @throws \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
|
||||||
|
* @throws \Exception
|
||||||
*/
|
*/
|
||||||
public function route_post($id, RouteRequest $request)
|
public function route_post($id, RouteRequest $request)
|
||||||
{
|
{
|
||||||
@@ -506,6 +507,10 @@ class PirepController extends Controller
|
|||||||
|
|
||||||
$count = 0;
|
$count = 0;
|
||||||
$route = $request->post('route', []);
|
$route = $request->post('route', []);
|
||||||
|
if (\count($route) === 0) {
|
||||||
|
return $this->message('No points to add');
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($route as $position) {
|
foreach ($route as $position) {
|
||||||
$position['pirep_id'] = $id;
|
$position['pirep_id'] = $id;
|
||||||
$position['type'] = AcarsType::ROUTE;
|
$position['type'] = AcarsType::ROUTE;
|
||||||
|
|||||||
@@ -21,12 +21,12 @@ class RouteRequest extends FormRequest
|
|||||||
public function rules()
|
public function rules()
|
||||||
{
|
{
|
||||||
$rules = [
|
$rules = [
|
||||||
'route' => 'nullable|array',
|
'route' => 'required|array',
|
||||||
/*'route.*.name' => 'required',
|
'route.*.name' => 'required',
|
||||||
'route.*.order' => 'required|int',
|
'route.*.order' => 'required|int',
|
||||||
'route.*.nav_type' => 'nullable|int',
|
'route.*.nav_type' => 'nullable|int',
|
||||||
'route.*.lat' => 'required|numeric',
|
'route.*.lat' => 'required|numeric',
|
||||||
'route.*.lon' => 'required|numeric',*/
|
'route.*.lon' => 'required|numeric',
|
||||||
];
|
];
|
||||||
|
|
||||||
return $rules;
|
return $rules;
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
<table class="table table-responsive table-hover" id="flight-fields-table">
|
<table class="table table-responsive table-hover" id="flight-fields-table">
|
||||||
|
@if(count($pirep->fields))
|
||||||
<thead>
|
<thead>
|
||||||
<th></th>
|
<th></th>
|
||||||
<th>Value</th>
|
<th>Value</th>
|
||||||
<th>Source</th>
|
<th>Source</th>
|
||||||
</thead>
|
</thead>
|
||||||
|
@endif
|
||||||
<tbody>
|
<tbody>
|
||||||
@foreach($pirep->fields as $field)
|
@foreach($pirep->fields as $field)
|
||||||
<tr>
|
<tr>
|
||||||
|
|||||||
@@ -270,7 +270,7 @@ flight reports that have been filed. You've been warned!
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-4">
|
<div class="col-4">
|
||||||
|
@if(isset($pirep) && $pirep->fields)
|
||||||
<div class="form-container">
|
<div class="form-container">
|
||||||
<h6><i class="fab fa-wpforms"></i>
|
<h6><i class="fab fa-wpforms"></i>
|
||||||
{{ trans_choice('common.field', 2) }}
|
{{ trans_choice('common.field', 2) }}
|
||||||
@@ -282,7 +282,7 @@ flight reports that have been filed. You've been warned!
|
|||||||
@each('pireps.custom_fields', $pirep->fields, 'field')
|
@each('pireps.custom_fields', $pirep->fields, 'field')
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@endif
|
||||||
<div id="fares_container">
|
<div id="fares_container">
|
||||||
@include('pireps.fares')
|
@include('pireps.fares')
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -643,6 +643,7 @@ class AcarsTest extends TestCase
|
|||||||
$response = $this->post($uri, $pirep);
|
$response = $this->post($uri, $pirep);
|
||||||
$pirep_id = $response->json()['data']['id'];
|
$pirep_id = $response->json()['data']['id'];
|
||||||
|
|
||||||
|
// Missing lat/lon
|
||||||
$post_route = ['order' => 1, 'name' => 'NAVPOINT'];
|
$post_route = ['order' => 1, 'name' => 'NAVPOINT'];
|
||||||
$uri = '/api/pireps/'.$pirep_id.'/route';
|
$uri = '/api/pireps/'.$pirep_id.'/route';
|
||||||
$response = $this->post($uri, $post_route);
|
$response = $this->post($uri, $post_route);
|
||||||
|
|||||||
Reference in New Issue
Block a user