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

Fix saving PIREPs as draft

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-05-29 11:04:28 -05:00
parent e02ae682a8
commit d76b264238
12 changed files with 125 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/Http/Requests/UpdatePirepRequest.php
View File

@@ -3,7 +3,9 @@
namespace App\Http\Requests;
use App\Models\Pirep;
use App\Repositories\PirepFieldRepository;
use Illuminate\Foundation\Http\FormRequest;
use Log;
class UpdatePirepRequest extends FormRequest
{
@@ -24,6 +26,31 @@ class UpdatePirepRequest extends FormRequest
*/
public function rules()
{
return Pirep::$rules;
// Don't run validations if it's just being saved
$action = strtolower(request('submit', 'submit'));
if ($action === 'save' || $action === 'cancel' || $action === 'delete') {
return [
'airline_id' => 'required|exists:airlines,id',
'flight_number' => 'required',
'dpt_airport_id' => 'required',
'arr_airport_id' => 'required',
];
}
$field_rules = Pirep::$rules;
$field_rules['hours'] = 'nullable|integer';
$field_rules['minutes'] = 'nullable|integer';
# Add the validation rules for the custom fields
$pirepFieldRepo = app(PirepFieldRepository::class);
$custom_fields = $pirepFieldRepo->all();
foreach ($custom_fields as $field) {
Log::info('field:', $field->toArray());
$field_rules[$field->slug] = $field->required ? 'required' : 'nullable';
}
return $field_rules;
}
}