api fixes/updates

This commit is contained in:
Nabeel Shahzad
2018-05-01 20:58:05 -05:00
parent 50abda71cb
commit b96f1cd7c4
17 changed files with 1282 additions and 1604 deletions

View File

@@ -9,10 +9,12 @@
@section('scripts')
<script type="text/javascript">
phpvms.map.render_route_map({
pirep_uri: '{!! url('/api/pireps/'.$pirep->id.'/acars/geojson') !!}',
route_points: {!! json_encode($map_features['planned_rte_points']) !!},
planned_route_line: {!! json_encode($map_features['planned_rte_line']) !!},
actual_route_line: {!! json_encode($map_features['actual_route_line']) !!},
actual_route_points: {!! json_encode($map_features['actual_route_points']) !!},
aircraft_icon: '{!! public_asset('/assets/img/acars/aircraft.png') !!}',
});
</script>
@endsection

View File

@@ -9,7 +9,13 @@
<div class="col-12">
<p>
<h2 style="margin-bottom: 5px;">{{$pirep->airline->code}}{{ $pirep->ident }}</h2>
<p>Arrived {{$pirep->created_at->diffForHumans()}}</p>
<p>
@if($pirep->state === PirepState::IN_PROGRESS)
@else
Arrived {{$pirep->created_at->diffForHumans()}}
@endif
</p>
</p>
</div>
@@ -55,8 +61,10 @@
<div class="progress" style="margin: 20px 0;">
<div class="progress-bar progress-bar-success" role="progressbar"
aria-valuenow="40" aria-valuemin="0" aria-valuemax="100"
style="width: {{$pirep->progress_percent}}%">
{{ Utils::minutesToTimeString($pirep->flight_time) }}
style="width: {{$pirep->progress_percent}}%;">
{{--<p style="padding: 10px">
{{ Utils::minutesToTimeString($pirep->flight_time) }}
</p>--}}
</div>
</div>
</div>
@@ -78,8 +86,8 @@
<div class="col-4">
<h2>&nbsp;</h2>
<table class="table table-hover table-condensed">
<tr>
<table class="table table-striped">
{{--<tr>
<td width="30%">Status</td>
<td>
@php
@@ -96,6 +104,15 @@
{{ PirepState::label($pirep->state) }}
</div>
</td>
</tr>--}}
<tr>
<td width="30%">State</td>
<td>
<div class="badge badge-info">
{{ PirepStatus::label($pirep->status) }}
</div>
</td>
</tr>
<tr>

View File

@@ -16,9 +16,10 @@
<table class="table">
@foreach($pireps as $pirep)
<tr>
<td>{{ $pirep->ident }}</td>
<td>{{ $pirep->airline->code }}{{ $pirep->ident }}</td>
<td>{{ $pirep->dpt_airport_id }}</td>
<td>{{ $pirep->arr_airport_id }}</td>
<td>{{ $pirep->aircraft->name }}</td>
<td>
{{ PirepStatus::label($pirep->status) }}
</td>