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

Get the correct ordering for flight route on map

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-02-21 15:15:12 -06:00
parent ec9d00c597
commit 77055991af
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/Pirep.php
+1 -1
View File
@@ -240,7 +240,7 @@ class Pirep extends BaseModel
{ {
return $this->hasMany(Acars::class, 'pirep_id') return $this->hasMany(Acars::class, 'pirep_id')
->where('type', AcarsType::FLIGHT_PATH) ->where('type', AcarsType::FLIGHT_PATH)
->orderBy('created_at', 'asc'); ->orderBy('created_at', 'desc');
} }
public function acars_logs() public function acars_logs()
app/Repositories/AcarsRepository.php
+10 -4
View File
@@ -28,12 +28,18 @@ class AcarsRepository extends BaseRepository //implements CacheableInterface
'type' => $type, 'type' => $type,
]; ];
$order_by = 'created_at'; switch($type) {
if($type === AcarsType::ROUTE) { default:
$order_by = 'order'; case AcarsType::FLIGHT_PATH:
case AcarsType::LOG:
$order_by = 'created_at';
break;
case AcarsType::ROUTE:
$order_by = 'order';
break;
} }
return $this->orderBy('order', 'asc')->findWhere($where); return $this->orderBy($order_by, 'asc')->findWhere($where);
} }
/** /**