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

Convert aircraft active to more detailed status #134

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-02-23 16:37:10 -06:00
parent 709aec83e2
commit 910c0e0eab
9 changed files with 91 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Models/Subfleet.php
View File

@@ -2,6 +2,8 @@
namespace App\Models;
use App\Models\Enums\AircraftStatus;
/**
* Class Subfleet
* @package App\Models
@@ -42,8 +44,8 @@ class Subfleet extends BaseModel
];
/**
* Modify some fields on the fly. Make sure the subfleet
* names don't have spaces in them.
* Modify some fields on the fly. Make sure the subfleet names don't
* have spaces in them, so the csv import/export can use the types
*/
public static function boot()
{
@@ -51,7 +53,8 @@ class Subfleet extends BaseModel
static::creating(function ($model) {
if (filled($model->type)) {
$model->type = str_replace(' ', '_', $model->type);
$model->type = str_replace(' ', '-', $model->type);
$model->type = str_replace(',', '', $model->type);
}
if(!filled($model->ground_handling_multiplier)) {
@@ -61,7 +64,8 @@ class Subfleet extends BaseModel
static::updating(function ($model) {
if (filled($model->type)) {
$model->type = str_replace(' ', '_', $model->type);
$model->type = str_replace(' ', '-', $model->type);
$model->type = str_replace(',', '', $model->type);
}
});
}
@@ -72,7 +76,8 @@ class Subfleet extends BaseModel
public function aircraft()
{
return $this->hasMany(Aircraft::class, 'subfleet_id');
return $this->hasMany(Aircraft::class, 'subfleet_id')
->where('status', AircraftStatus::ACTIVE);
}
public function airline()