Fix formatting and interfaces in nearly every file
This commit is contained in:
@@ -18,7 +18,7 @@ class CommentRequest extends FormRequest
|
||||
public function rules()
|
||||
{
|
||||
$rules = [
|
||||
'comment' => 'required',
|
||||
'comment' => 'required',
|
||||
'created_at' => 'nullable|date',
|
||||
];
|
||||
|
||||
|
||||
@@ -12,19 +12,24 @@ use Illuminate\Foundation\Http\FormRequest;
|
||||
*/
|
||||
class EventRequest extends FormRequest
|
||||
{
|
||||
/**
|
||||
* @return bool
|
||||
* @throws \Illuminate\Database\Eloquent\ModelNotFoundException
|
||||
*/
|
||||
public function authorize()
|
||||
{
|
||||
$pirep = Pirep::findOrFail($this->route('pirep_id'), ['user_id']);
|
||||
|
||||
return $pirep->user_id === Auth::id();
|
||||
}
|
||||
|
||||
public function rules()
|
||||
{
|
||||
$rules = [
|
||||
'events' => 'required|array',
|
||||
'events.*.event' => 'required',
|
||||
'events.*.lat' => 'nullable|numeric',
|
||||
'events.*.lon' => 'nullable|numeric',
|
||||
'events' => 'required|array',
|
||||
'events.*.event' => 'required',
|
||||
'events.*.lat' => 'nullable|numeric',
|
||||
'events.*.lon' => 'nullable|numeric',
|
||||
'events.*.created_at' => 'nullable|date',
|
||||
];
|
||||
|
||||
|
||||
@@ -15,39 +15,40 @@ class FileRequest extends FormRequest
|
||||
public function authorize()
|
||||
{
|
||||
$pirep = Pirep::findOrFail($this->route('pirep_id'), ['user_id']);
|
||||
|
||||
return $pirep->user_id === Auth::id();
|
||||
}
|
||||
|
||||
public function rules()
|
||||
{
|
||||
$rules = [
|
||||
'distance' => 'required|numeric',
|
||||
'flight_time' => 'required|integer',
|
||||
'fuel_used' => 'required|numeric',
|
||||
'distance' => 'required|numeric',
|
||||
'flight_time' => 'required|integer',
|
||||
'fuel_used' => 'required|numeric',
|
||||
|
||||
'airline_id' => 'nullable|exists:airlines,id',
|
||||
'aircraft_id' => 'nullable|exists:aircraft,id',
|
||||
'flight_number' => 'nullable',
|
||||
'dpt_airport_id' => 'nullable',
|
||||
'arr_airport_id' => 'nullable',
|
||||
'route_code' => 'nullable',
|
||||
'route_leg' => 'nullable',
|
||||
'planned_distance' => 'nullable|numeric',
|
||||
'planned_flight_time' => 'nullable|integer',
|
||||
'level' => 'nullable|numeric',
|
||||
'zfw' => 'nullable|numeric',
|
||||
'block_fuel' => 'nullable|numeric',
|
||||
'route' => 'nullable',
|
||||
'notes' => 'nullable',
|
||||
'source_name' => 'nullable|max:25',
|
||||
'landing_rate' => 'nullable|numeric',
|
||||
'flight_type' => 'nullable|integer',
|
||||
'created_at' => 'nullable|date',
|
||||
'airline_id' => 'nullable|exists:airlines,id',
|
||||
'aircraft_id' => 'nullable|exists:aircraft,id',
|
||||
'flight_number' => 'nullable',
|
||||
'dpt_airport_id' => 'nullable',
|
||||
'arr_airport_id' => 'nullable',
|
||||
'route_code' => 'nullable',
|
||||
'route_leg' => 'nullable',
|
||||
'planned_distance' => 'nullable|numeric',
|
||||
'planned_flight_time' => 'nullable|integer',
|
||||
'level' => 'nullable|numeric',
|
||||
'zfw' => 'nullable|numeric',
|
||||
'block_fuel' => 'nullable|numeric',
|
||||
'route' => 'nullable',
|
||||
'notes' => 'nullable',
|
||||
'source_name' => 'nullable|max:25',
|
||||
'landing_rate' => 'nullable|numeric',
|
||||
'flight_type' => 'nullable|integer',
|
||||
'created_at' => 'nullable|date',
|
||||
|
||||
# See if the fare objects are included and formatted properly
|
||||
'fares' => 'nullable|array',
|
||||
'fares.*.id' => 'required',
|
||||
'fares.*.count' => 'required|numeric',
|
||||
'fares' => 'nullable|array',
|
||||
'fares.*.id' => 'required',
|
||||
'fares.*.count' => 'required|numeric',
|
||||
];
|
||||
|
||||
return $rules;
|
||||
|
||||
@@ -15,16 +15,17 @@ class LogRequest extends FormRequest
|
||||
public function authorize()
|
||||
{
|
||||
$pirep = Pirep::findOrFail($this->route('pirep_id'), ['user_id']);
|
||||
|
||||
return $pirep->user_id === Auth::id();
|
||||
}
|
||||
|
||||
public function rules()
|
||||
{
|
||||
$rules = [
|
||||
'logs' => 'required|array',
|
||||
'logs.*.log' => 'required',
|
||||
'logs.*.lat' => 'nullable|numeric',
|
||||
'logs.*.lon' => 'nullable|numeric',
|
||||
'logs' => 'required|array',
|
||||
'logs.*.log' => 'required',
|
||||
'logs.*.lat' => 'nullable|numeric',
|
||||
'logs.*.lon' => 'nullable|numeric',
|
||||
'logs.*.created_at' => 'nullable|date',
|
||||
];
|
||||
|
||||
|
||||
@@ -15,24 +15,25 @@ class PositionRequest extends FormRequest
|
||||
public function authorize()
|
||||
{
|
||||
$pirep = Pirep::findOrFail($this->route('pirep_id'), ['user_id']);
|
||||
|
||||
return $pirep->user_id === Auth::id();
|
||||
}
|
||||
|
||||
public function rules()
|
||||
{
|
||||
$rules = [
|
||||
'positions' => 'required|array',
|
||||
'positions.*.lat' => 'required|numeric',
|
||||
'positions.*.lon' => 'required|numeric',
|
||||
'positions.*.altitude' => 'nullable|numeric',
|
||||
'positions.*.heading' => 'nullable|integer|between:0,360',
|
||||
'positions.*.vs' => 'nullable',
|
||||
'positions.*.gs' => 'nullable',
|
||||
'positions' => 'required|array',
|
||||
'positions.*.lat' => 'required|numeric',
|
||||
'positions.*.lon' => 'required|numeric',
|
||||
'positions.*.altitude' => 'nullable|numeric',
|
||||
'positions.*.heading' => 'nullable|integer|between:0,360',
|
||||
'positions.*.vs' => 'nullable',
|
||||
'positions.*.gs' => 'nullable',
|
||||
'positions.*.transponder' => 'nullable',
|
||||
'positions.*.autopilot' => 'nullable',
|
||||
'positions.*.fuel_flow' => 'nullable',
|
||||
'positions.*.log' => 'nullable',
|
||||
'positions.*.created_at' => 'nullable|date',
|
||||
'positions.*.autopilot' => 'nullable',
|
||||
'positions.*.fuel_flow' => 'nullable',
|
||||
'positions.*.log' => 'nullable',
|
||||
'positions.*.created_at' => 'nullable|date',
|
||||
];
|
||||
|
||||
return $rules;
|
||||
|
||||
@@ -18,31 +18,31 @@ class PrefileRequest extends FormRequest
|
||||
public function rules()
|
||||
{
|
||||
$rules = [
|
||||
'airline_id' => 'required|exists:airlines,id',
|
||||
'aircraft_id' => 'required|exists:aircraft,id',
|
||||
'flight_number' => 'required',
|
||||
'dpt_airport_id' => 'required',
|
||||
'arr_airport_id' => 'required',
|
||||
'source_name' => 'required|max:25',
|
||||
'airline_id' => 'required|exists:airlines,id',
|
||||
'aircraft_id' => 'required|exists:aircraft,id',
|
||||
'flight_number' => 'required',
|
||||
'dpt_airport_id' => 'required',
|
||||
'arr_airport_id' => 'required',
|
||||
'source_name' => 'required|max:25',
|
||||
|
||||
'level' => 'nullable|numeric',
|
||||
'route_code' => 'nullable',
|
||||
'route_leg' => 'nullable',
|
||||
'distance' => 'nullable|numeric',
|
||||
'flight_time' => 'nullable|integer',
|
||||
'planned_distance' => 'nullable|numeric',
|
||||
'planned_flight_time' => 'nullable|integer',
|
||||
'zfw' => 'nullable|numeric',
|
||||
'block_fuel' => 'nullable|numeric',
|
||||
'route' => 'nullable',
|
||||
'notes' => 'nullable',
|
||||
'flight_type' => 'nullable|integer',
|
||||
'created_at' => 'nullable|date',
|
||||
'level' => 'nullable|numeric',
|
||||
'route_code' => 'nullable',
|
||||
'route_leg' => 'nullable',
|
||||
'distance' => 'nullable|numeric',
|
||||
'flight_time' => 'nullable|integer',
|
||||
'planned_distance' => 'nullable|numeric',
|
||||
'planned_flight_time' => 'nullable|integer',
|
||||
'zfw' => 'nullable|numeric',
|
||||
'block_fuel' => 'nullable|numeric',
|
||||
'route' => 'nullable',
|
||||
'notes' => 'nullable',
|
||||
'flight_type' => 'nullable|integer',
|
||||
'created_at' => 'nullable|date',
|
||||
|
||||
# See if the fare objects are included and formatted properly
|
||||
'fares' => 'nullable|array',
|
||||
'fares.*.id' => 'required',
|
||||
'fares.*.count' => 'required|numeric',
|
||||
'fares' => 'nullable|array',
|
||||
'fares.*.id' => 'required',
|
||||
'fares.*.count' => 'required|numeric',
|
||||
];
|
||||
|
||||
return $rules;
|
||||
|
||||
@@ -15,18 +15,19 @@ class RouteRequest extends FormRequest
|
||||
public function authorize()
|
||||
{
|
||||
$pirep = Pirep::findOrFail($this->route('pirep_id'), ['user_id']);
|
||||
|
||||
return $pirep->user_id === Auth::id();
|
||||
}
|
||||
|
||||
public function rules()
|
||||
{
|
||||
$rules = [
|
||||
'route' => 'required|array',
|
||||
'route.*.name' => 'required',
|
||||
'route.*.order' => 'required|int',
|
||||
'route' => 'required|array',
|
||||
'route.*.name' => 'required',
|
||||
'route.*.order' => 'required|int',
|
||||
'route.*.nav_type' => 'nullable|int',
|
||||
'route.*.lat' => 'required|numeric',
|
||||
'route.*.lon' => 'required|numeric',
|
||||
'route.*.lat' => 'required|numeric',
|
||||
'route.*.lon' => 'required|numeric',
|
||||
];
|
||||
|
||||
return $rules;
|
||||
|
||||
@@ -15,38 +15,39 @@ class UpdateRequest extends FormRequest
|
||||
public function authorize()
|
||||
{
|
||||
$pirep = Pirep::findOrFail($this->route('pirep_id'), ['user_id']);
|
||||
|
||||
return $pirep->user_id === Auth::id();
|
||||
}
|
||||
|
||||
public function rules()
|
||||
{
|
||||
$rules = [
|
||||
'airline_id' => 'nullable|exists:airlines,id',
|
||||
'aircraft_id' => 'nullable|exists:aircraft,id',
|
||||
'flight_number' => 'nullable',
|
||||
'dpt_airport_id' => 'nullable',
|
||||
'arr_airport_id' => 'nullable',
|
||||
'route_code' => 'nullable',
|
||||
'route_leg' => 'nullable',
|
||||
'distance' => 'nullable|numeric',
|
||||
'planned_distance' => 'nullable|numeric',
|
||||
'planned_flight_time' => 'nullable|integer',
|
||||
'flight_time' => 'nullable|integer',
|
||||
'level' => 'nullable|numeric',
|
||||
'zfw' => 'nullable|numeric',
|
||||
'fuel_used' => 'nullable|numeric',
|
||||
'block_fuel' => 'nullable|numeric',
|
||||
'route' => 'nullable',
|
||||
'notes' => 'nullable',
|
||||
'source_name' => 'nullable|max:25',
|
||||
'landing_rate' => 'nullable|numeric',
|
||||
'flight_type' => 'nullable|integer',
|
||||
'created_at' => 'nullable|date',
|
||||
'airline_id' => 'nullable|exists:airlines,id',
|
||||
'aircraft_id' => 'nullable|exists:aircraft,id',
|
||||
'flight_number' => 'nullable',
|
||||
'dpt_airport_id' => 'nullable',
|
||||
'arr_airport_id' => 'nullable',
|
||||
'route_code' => 'nullable',
|
||||
'route_leg' => 'nullable',
|
||||
'distance' => 'nullable|numeric',
|
||||
'planned_distance' => 'nullable|numeric',
|
||||
'planned_flight_time' => 'nullable|integer',
|
||||
'flight_time' => 'nullable|integer',
|
||||
'level' => 'nullable|numeric',
|
||||
'zfw' => 'nullable|numeric',
|
||||
'fuel_used' => 'nullable|numeric',
|
||||
'block_fuel' => 'nullable|numeric',
|
||||
'route' => 'nullable',
|
||||
'notes' => 'nullable',
|
||||
'source_name' => 'nullable|max:25',
|
||||
'landing_rate' => 'nullable|numeric',
|
||||
'flight_type' => 'nullable|integer',
|
||||
'created_at' => 'nullable|date',
|
||||
|
||||
# See if the fare objects are included and formatted properly
|
||||
'fares' => 'nullable|array',
|
||||
'fares.*.id' => 'required',
|
||||
'fares.*.count' => 'required|numeric',
|
||||
'fares' => 'nullable|array',
|
||||
'fares.*.id' => 'required',
|
||||
'fares.*.count' => 'required|numeric',
|
||||
];
|
||||
|
||||
return $rules;
|
||||
|
||||
@@ -7,7 +7,6 @@ use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class CreateAircraftRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
|
||||
@@ -17,6 +17,7 @@ class CreateAirlineRequest extends FormRequest
|
||||
$rules = Airline::$rules;
|
||||
$rules['iata'] .= '|unique:airlines';
|
||||
$rules['icao'] .= '|unique:airlines';
|
||||
|
||||
return $rules;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@ class CreateAirportRequest extends FormRequest
|
||||
{
|
||||
$rules = Airport::$rules;
|
||||
$rules['icao'] .= '|unique:airports';
|
||||
|
||||
return $rules;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,12 +2,11 @@
|
||||
|
||||
namespace App\Http\Requests;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use App\Models\Award;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class CreateAwardRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
|
||||
@@ -7,7 +7,6 @@ use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class CreateFareRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
|
||||
@@ -7,7 +7,6 @@ use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class CreateFlightRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
|
||||
@@ -5,10 +5,8 @@ namespace App\Http\Requests;
|
||||
use App\Models\PirepField;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
|
||||
class CreatePirepFieldRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
|
||||
@@ -7,7 +7,6 @@ use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class CreateRankRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
|
||||
@@ -7,7 +7,6 @@ use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class CreateSubfleetRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
|
||||
@@ -7,7 +7,6 @@ use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class CreateUserRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
@@ -27,6 +26,7 @@ class CreateUserRequest extends FormRequest
|
||||
{
|
||||
$rules = User::$rules;
|
||||
$rules['email'] .= '|unique:users,email';
|
||||
|
||||
return $rules;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,12 +2,11 @@
|
||||
|
||||
namespace App\Http\Requests;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use App\Models\Aircraft;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class UpdateAircraftRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
|
||||
@@ -7,7 +7,6 @@ use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class UpdateAirlineRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
|
||||
@@ -7,7 +7,6 @@ use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class UpdateAirportRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
|
||||
@@ -2,12 +2,11 @@
|
||||
|
||||
namespace App\Http\Requests;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use App\Models\Award;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class UpdateAwardRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
|
||||
@@ -7,7 +7,6 @@ use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class UpdateFareRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
|
||||
@@ -7,7 +7,6 @@ use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class UpdateFlightRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
|
||||
@@ -7,7 +7,6 @@ use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class UpdatePirepFieldRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
|
||||
@@ -7,7 +7,6 @@ use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class UpdatePirepRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
|
||||
@@ -7,7 +7,6 @@ use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class UpdateRankRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
|
||||
@@ -7,7 +7,6 @@ use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class UpdateSubfleetRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
|
||||
@@ -7,7 +7,6 @@ use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class UpdateUserRequest extends FormRequest
|
||||
{
|
||||
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user