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

Issue fixes (#341)

Browse Source 
* Better error handling around ACARS position updates

* Add step for decimals on fuel block/used fields closes #340

* Styling

* Rename AcarsController to LiveMapController; update JS dependencies
This commit is contained in:
Nabeel S
2019-08-05 13:07:22 -04:00
committed by GitHub
parent 9f3ba05880
commit 753804b71b
9 changed files with 1234 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/Http/Controllers/Api/AcarsController.php
View File

@@ -15,10 +15,11 @@ use App\Models\Pirep;
use App\Repositories\AcarsRepository;
use App\Repositories\PirepRepository;
use App\Services\GeoService;
use Auth;
use Carbon\Carbon;
use Illuminate\Database\QueryException;
use Illuminate\Http\Request;
use Log;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
/**
* Class AcarsController
@@ -157,10 +158,13 @@ class AcarsController extends Controller
}
}
$update = Acars::create($position);
$update->save();
$count++;
try {
$update = Acars::create($position);
$update->save();
$count++;
} catch (QueryException $ex) {
Log::info('Error on adding ACARS position: '.$ex->getMessage());
}
}
// Change the PIREP status if it's as SCHEDULED before
@@ -207,9 +211,13 @@ class AcarsController extends Controller
$log['created_at'] = Carbon::createFromTimeString($log['created_at']);
}
$acars = Acars::create($log);
$acars->save();
$count++;
try {
$acars = Acars::create($log);
$acars->save();
$count++;
} catch (QueryException $ex) {
Log::info('Error on adding ACARS position: '.$ex->getMessage());
}
}
return $this->message($count.' logs added', $count);
@@ -250,9 +258,13 @@ class AcarsController extends Controller
$log['created_at'] = Carbon::createFromTimeString($log['created_at']);
}
$acars = Acars::create($log);
$acars->save();
$count++;
try {
$acars = Acars::create($log);
$acars->save();
$count++;
} catch (QueryException $ex) {
Log::info('Error on adding ACARS position: '.$ex->getMessage());
}
}
return $this->message($count.' logs added', $count);

7
app/Http/Controllers/Frontend/AcarsController.php → app/Http/Controllers/Frontend/LiveMapController.php
View File

@@ -7,10 +7,7 @@ use App\Repositories\AcarsRepository;
use App\Services\GeoService;
use Illuminate\Http\Request;
/**
* Class AcarsController
*/
class AcarsController extends Controller
class LiveMapController extends Controller
{
private $acarsRepo;
private $geoSvc;
@@ -39,7 +36,7 @@ class AcarsController extends Controller
$pireps = $this->acarsRepo->getPositions();
$positions = $this->geoSvc->getFeatureForLiveFlights($pireps);
return view('acars.index', [
return view('livemap.index', [
'pireps' => $pireps,
'positions' => $positions,
]);