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

Fix flight page errors and some naming fixes

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-03-08 08:51:36 -06:00
parent fefc6bc22a
commit f13c961863
27 changed files with 125 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Console/Commands/Version.php
View File

@@ -19,7 +19,7 @@ class Version extends BaseCommand
# prefix with the date in YYMMDD format
$date = date('ymd');
$version = $date.'-'.$version;
$version = $date . '-' . $version;
return $version;
}
@@ -40,7 +40,7 @@ class Version extends BaseCommand
$c = $cfg['current'];
$version = "v{$c['major']}.{$c['minor']}.{$c['patch']}-{$build_number}";
if($this->option('write')) {
if ($this->option('write')) {
file_put_contents($version_file, Yaml::dump($cfg, 4, 2));
}

4
app/Models/Acars.php
View File

@@ -2,11 +2,11 @@
namespace App\Models;
use App\Models\Traits\HashId;
use App\Models\Traits\HashIdTrait;
class Acars extends BaseModel
{
use HashId;
use HashIdTrait;
public $table = 'acars';
public $incrementing = false;

4
app/Models/Aircraft.php
View File

@@ -3,7 +3,7 @@
namespace App\Models;
use App\Models\Enums\AircraftStatus;
use App\Models\Traits\Expensable;
use App\Models\Traits\ExpensableTrait;
use App\Support\ICAO;
/**
@@ -19,7 +19,7 @@ use App\Support\ICAO;
*/
class Aircraft extends BaseModel
{
use Expensable;
use ExpensableTrait;
public $table = 'aircraft';

4
app/Models/Airport.php
View File

@@ -2,7 +2,7 @@
namespace App\Models;
use App\Models\Traits\Expensable;
use App\Models\Traits\ExpensableTrait;
use Illuminate\Notifications\Notifiable;
/**
@@ -12,7 +12,7 @@ use Illuminate\Notifications\Notifiable;
*/
class Airport extends BaseModel
{
use Expensable;
use ExpensableTrait;
use Notifiable;
public $table = 'airports';

2
app/Models/Enums/AcarsType.php
View File

@@ -6,7 +6,7 @@ namespace App\Models\Enums;
* Class AcarsType
* @package App\Models\Enums
*/
class AcarsType extends EnumBase
class AcarsType extends Enum
{
public const FLIGHT_PATH = 0;
public const ROUTE = 1;

2
app/Models/Enums/ActiveState.php
View File

@@ -6,7 +6,7 @@ namespace App\Models\Enums;
* Class ActiveState
* @package App\Models\Enums
*/
class ActiveState extends EnumBase
class ActiveState extends Enum
{
public const INACTIVE = 0;
public const ACTIVE = 1;

2
app/Models/Enums/AircraftState.php
View File

@@ -6,7 +6,7 @@ namespace App\Models\Enums;
* Class AircraftState
* @package App\Models\Enums
*/
class AircraftState extends EnumBase
class AircraftState extends Enum
{
public const PARKED = 0;
public const IN_USE = 1;

2
app/Models/Enums/AircraftStatus.php
View File

@@ -6,7 +6,7 @@ namespace App\Models\Enums;
* Class AircraftState
* @package App\Models\Enums
*/
class AircraftStatus extends EnumBase
class AircraftStatus extends Enum
{
public const STORED = 0;
public const ACTIVE = 1;

2
app/Models/Enums/Days.php
View File

@@ -9,7 +9,7 @@ namespace App\Models\Enums;
* Class Days
* @package App\Models\Enums
*/
class Days extends EnumBase {
class Days extends Enum {
public const MONDAY = 1 << 0;
public const TUESDAY = 1 << 1;

89
app/Models/Enums/Enum.php Normal file
View File

@@ -0,0 +1,89 @@
<?php
namespace App\Models\Enums;
/**
* Class EnumBase
* @package App\Models\Enums
*/
abstract class Enum
{
protected static $labels = [];
protected static $cache = [];
/**
* Return the label, try to return the translated version as well
* @param $value
* @return mixed
*/
public static function label($value) {
if(isset(static::$labels[$value])) {
return trans(static::$labels[$value]);
}
}
/**
* Return all of the (translated) labels
*/
public static function labels()
{
$labels = [];
foreach(static::$labels as $key => $label) {
$labels[$key] = trans($label);
}
return $labels;
}
/**
* Select box
*/
public static function select($add_blank=false)
{
$labels = [];
if($add_blank) {
$labels[] = '';
}
foreach (static::$labels as $key => $label) {
$labels[$key] = trans($label);
}
return $labels;
}
/**
* Returns all possible values as an array
* @return array Constant name in key, constant value in value
* @throws \ReflectionException
*/
public static function toArray()
{
$class = get_called_class();
if (!array_key_exists($class, static::$cache)) {
$reflection = new \ReflectionClass($class);
static::$cache[$class] = $reflection->getConstants();
}
return static::$cache[$class];
}
/**
* Returns a value when called statically like so: MyEnum::SOME_VALUE() given SOME_VALUE is a class constant
* @param string $name
* @param array $arguments
* @return static
* @throws \BadMethodCallException
* @throws \ReflectionException
*/
public static function __callStatic($name, $arguments)
{
$array = static::toArray();
if (isset($array[$name])) {
return new static($array[$name]);
}
throw new \BadMethodCallException(
"No static method or enum constant '$name' in class ".get_called_class()
);
}
}

53
app/Models/Enums/EnumBase.php
View File

@@ -1,53 +0,0 @@
<?php
namespace App\Models\Enums;
/**
* Class EnumBase
* @package App\Models\Enums
*/
class EnumBase
{
protected static $labels = [];
/**
* Return the label, try to return the translated version as well
* @param $value
* @return mixed
*/
public static function label($value) {
if(isset(static::$labels[$value])) {
return trans(static::$labels[$value]);
}
}
/**
* Return all of the (translated) labels
*/
public static function labels()
{
$labels = [];
foreach(static::$labels as $key => $label) {
$labels[$key] = trans($label);
}
return $labels;
}
/**
* Select box
*/
public static function select($add_blank=false)
{
$labels = [];
if($add_blank) {
$labels[] = '';
}
foreach (static::$labels as $key => $label) {
$labels[$key] = trans($label);
}
return $labels;
}
}

2
app/Models/Enums/ExpenseType.php
View File

@@ -6,7 +6,7 @@ namespace App\Models\Enums;
* Class ExpenseType
* @package App\Models\Enums
*/
class ExpenseType extends EnumBase {
class ExpenseType extends Enum {
public const FLIGHT = 0;
public const DAILY = 1;

2
app/Models/Enums/FlightType.php
View File

@@ -3,7 +3,7 @@
namespace App\Models\Enums;
class FlightType extends EnumBase {
class FlightType extends Enum {
public const PASSENGER = 0;
public const CARGO = 1;

2
app/Models/Enums/FuelType.php
View File

@@ -2,7 +2,7 @@
namespace App\Models\Enums;
class FuelType extends EnumBase {
class FuelType extends Enum {
public const LOW_LEAD = 0;
public const JET_A = 1;

2
app/Models/Enums/JournalType.php
View File

@@ -6,7 +6,7 @@ namespace App\Models\Enums;
* Class AcarsType
* @package App\Models\Enums
*/
class JournalType extends EnumBase
class JournalType extends Enum
{
public const AIRLINE = 0;
public const USER = 1;

2
app/Models/Enums/NavaidType.php
View File

@@ -11,7 +11,7 @@ namespace App\Models\Enums;
* https://github.com/skiselkov/openfmc/blob/master/airac.h
* @package App\Models\Enums
*/
class NavaidType extends EnumBase
class NavaidType extends Enum
{
public const VOR = 1 << 0;
public const VOR_DME = 1 << 1;

2
app/Models/Enums/PirepSource.php
View File

@@ -2,7 +2,7 @@
namespace App\Models\Enums;
class PirepSource extends EnumBase
class PirepSource extends Enum
{
public const MANUAL = 0;
public const ACARS = 1;

2
app/Models/Enums/PirepState.php
View File

@@ -2,7 +2,7 @@
namespace App\Models\Enums;
class PirepState extends EnumBase {
class PirepState extends Enum {
public const REJECTED = -1;
public const IN_PROGRESS = 0; // flight is ongoing

2
app/Models/Enums/PirepStatus.php
View File

@@ -10,7 +10,7 @@ namespace App\Models\Enums;
* Class PirepStatus
* @package App\Models\Enums
*/
class PirepStatus extends EnumBase
class PirepStatus extends Enum
{
public const PREFILE = 0;
public const SCHEDULED = 0;

2
app/Models/Enums/UserState.php
View File

@@ -5,7 +5,7 @@
namespace App\Models\Enums;
class UserState extends EnumBase
class UserState extends Enum
{
public const PENDING = 0;
public const ACTIVE = 1;

4
app/Models/Flight.php
View File

@@ -2,7 +2,7 @@
namespace App\Models;
use App\Models\Traits\HashId;
use App\Models\Traits\HashIdTrait;
use App\Support\Units\Distance;
use App\Support\Units\Time;
use PhpUnitsOfMeasure\Exception\NonNumericValue;
@@ -10,7 +10,7 @@ use PhpUnitsOfMeasure\Exception\NonStringUnitName;
class Flight extends BaseModel
{
use HashId;
use HashIdTrait;
public const ID_MAX_LENGTH = 12;

4
app/Models/Pirep.php
View File

@@ -4,7 +4,7 @@ namespace App\Models;
use App\Models\Enums\AcarsType;
use App\Models\Enums\PirepState;
use App\Models\Traits\HashId;
use App\Models\Traits\HashIdTrait;
use App\Support\Units\Distance;
use App\Support\Units\Fuel;
use PhpUnitsOfMeasure\Exception\NonNumericValue;
@@ -27,7 +27,7 @@ use PhpUnitsOfMeasure\Exception\NonStringUnitName;
*/
class Pirep extends BaseModel
{
use HashId;
use HashIdTrait;
public const ID_MAX_LENGTH = 12;

4
app/Models/Subfleet.php
View File

@@ -3,7 +3,7 @@
namespace App\Models;
use App\Models\Enums\AircraftStatus;
use App\Models\Traits\Expensable;
use App\Models\Traits\ExpensableTrait;
/**
* Class Subfleet
@@ -11,7 +11,7 @@ use App\Models\Traits\Expensable;
*/
class Subfleet extends BaseModel
{
use Expensable;
use ExpensableTrait;
public $table = 'subfleets';

2
app/Models/Traits/Expensable.php → app/Models/Traits/ExpensableTrait.php
View File

@@ -4,7 +4,7 @@ namespace App\Models\Traits;
use App\Models\Expense;
trait Expensable
trait ExpensableTrait
{
public static function bootExpensable()
{

2
app/Models/Traits/HashId.php → app/Models/Traits/HashIdTrait.php
View File

@@ -4,7 +4,7 @@ namespace App\Models\Traits;
use Hashids\Hashids;
trait HashId
trait HashIdTrait
{
/**
* @return string

8
config/ide-helper.php
View File

@@ -1,4 +1,4 @@
<?php
<?php
return array(
@@ -41,7 +41,7 @@ return array(
*/
'model_locations' => array(
'app',
'app/Models',
),
@@ -71,7 +71,7 @@ return array(
'emergency' => 'Monolog\Logger::addEmergency',
)
),
/*
|--------------------------------------------------------------------------
| Interface implementations
@@ -81,7 +81,7 @@ return array(
| are detected by the helpers, others can be listed below.
|
*/
'interfaces' => array(
),

4
resources/views/layouts/default/flights/table.blade.php
View File

@@ -39,12 +39,12 @@
<br />
@if($flight->distance)
<span class="title">DISTANCE&nbsp;</span>
{!! $flight->distance !!} {!! setting('general.distance_unit') !!}
{!! $flight->distance !!} {!! setting('units.distance') !!}
@endif
<br />
@if($flight->level)
<span class="title">LEVEL&nbsp;</span>
{!! $flight->level !!} {!! setting('general.altitude_unit') !!}
{!! $flight->level !!} {!! setting('units.altitude') !!}
@endif
</div>
<div class="col-sm-7">