Fix pirep->ident usage issues (#1347)

* Update table.blade.php

* Update show.blade.php

* Update pirep_card.blade.php

* Update latest_pireps.blade.php

* Update ProfileController.php

Removed non used airports, added necessary relationships for eager loading.

Also removed `fields` 'cause it is already being loaded when `fields.field` is used. No need to query it twice.

* Update ProfileController.php
This commit is contained in:
B.Fatih KOZ
2021-11-09 00:08:19 +03:00
committed by GitHub
parent 358f0b663e
commit 2dbe19fdcc
5 changed files with 9 additions and 14 deletions

View File

@@ -80,7 +80,7 @@ class ProfileController extends Controller
public function show($id) public function show($id)
{ {
/** @var \App\Models\User $user */ /** @var \App\Models\User $user */
$user = User::with(['awards', 'fields', 'fields.field']) $user = User::with('airline', 'awards', 'current_airport', 'fields.field', 'home_airport', 'last_pirep', 'rank')
->where('id', $id) ->where('id', $id)
->first(); ->first();
@@ -89,13 +89,11 @@ class ProfileController extends Controller
return redirect(route('frontend.dashboard.index')); return redirect(route('frontend.dashboard.index'));
} }
$airports = $this->airportRepo->all();
$userFields = $this->userRepo->getUserFields($user, true); $userFields = $this->userRepo->getUserFields($user, true);
return view('profile.index', [ return view('profile.index', [
'user' => $user, 'user' => $user,
'userFields' => $userFields, 'userFields' => $userFields,
'airports' => $airports,
'acars' => $this->acarsEnabled(), 'acars' => $this->acarsEnabled(),
]); ]);
} }

View File

@@ -2,8 +2,7 @@
<div class="row"> <div class="row">
<div class="col-sm-10"> <div class="col-sm-10">
<p> <p>
<a href="{{ route('frontend.pireps.show', [$pirep->id]) }}"> <a href="{{ route('frontend.pireps.show', [$pirep->id]) }}">{{ $pirep->ident }}</a>
{{ $pirep->airline->code }}{{ $pirep->ident }}</a>
- -
{{ $pirep->dpt_airport->name }} {{ $pirep->dpt_airport->name }}
(<a href="{{route('frontend.airports.show', [ (<a href="{{route('frontend.airports.show', [

View File

@@ -4,8 +4,7 @@
@section('content') @section('content')
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<h2>{{ $pirep->airline->icao }}{{ $pirep->ident }} <h2>{{ $pirep->ident }} : {{ $pirep->dpt_airport_id }} to {{ $pirep->arr_airport_id }}</h2>
: {{ $pirep->dpt_airport_id }} to {{ $pirep->arr_airport_id }}</h2>
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">

View File

@@ -17,8 +17,7 @@
@foreach($pireps as $pirep) @foreach($pireps as $pirep)
<tr> <tr>
<td> <td>
<a href="{{ route('frontend.pireps.show', [ <a href="{{ route('frontend.pireps.show', [$pirep->id]) }}">{{ $pirep->ident }}</a>
$pirep->id]) }}">{{ $pirep->airline->code }}{{ $pirep->ident }}</a>
</td> </td>
<td> <td>
@if($pirep->dpt_airport){{ $pirep->dpt_airport->name }}@endif @if($pirep->dpt_airport){{ $pirep->dpt_airport->name }}@endif

View File

@@ -2,15 +2,15 @@
@foreach($pireps as $p) @foreach($pireps as $p)
<tr> <tr>
<td style="padding-right: 10px;"> <td style="padding-right: 10px;">
<span class="title">{{ $p->airline->code }} {{ $p->flight_number }}</span> <span class="title">{{ $p->ident }}</span>
</td> </td>
<td> <td>
<a href="{{route('frontend.airports.show', [$p->dpt_airport_id])}}">{{$p->dpt_airport_id}}</a> <a href="{{route('frontend.airports.show', [$p->dpt_airport_id])}}">{{$p->dpt_airport_id}}</a>
&nbsp;-&nbsp; &nbsp;-&nbsp;
<a href="{{route('frontend.airports.show', [$p->arr_airport_id])}}">{{$p->arr_airport_id}}</a>&nbsp; <a href="{{route('frontend.airports.show', [$p->arr_airport_id])}}">{{$p->arr_airport_id}}</a>
@if(!empty($p->aircraft)) </td>
{{ optional($p->aircraft)->registration }} ({{ $p->aircraft->icao }}) <td>
@endif {{ optional($p->aircraft)->ident }}
</td> </td>
</tr> </tr>
@endforeach @endforeach