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

Formatting on admin pirep page #952

Browse Source 
* Fix For Issue #952 / Admin Pirep Display

Removed unnecessary div tags to fix the broken display problem, defined the div class with a php code

* Fix and Update for Admin Pirep Index

Fixed the page width problem and search error , added the ability to also search for Rejected and Accepted pireps.
This commit is contained in:
B.Fatih KOZ 2020-12-06 04:27:03 +03:00 committed by GitHub
parent fb44b73f44
commit 883e8786e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 76 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
resources/views/admin/pireps/index.blade.php
View File

@ -2,16 +2,18 @@
@section('title', 'Pilot Reports') @section('title', 'Pilot Reports')
@section('actions') @section('actions')
<li><a href="{{ route('admin.pirepfields.index') }}"><i class="ti-menu-alt"></i>PIREP Fields</a></li> <li><a href="{{ route('admin.pirepfields.index') }}"><i class="ti-menu-alt"></i>PIREP Fields</a></li>
<li><a href="{{ route('admin.pireps.index') }}?search=status:{{ \App\Models\Enums\PirepState::PENDING }}"><i class="ti-plus"></i>Pending</a></li> <li><a href="{{ route('admin.pireps.index') }}?search=state:{{ \App\Models\Enums\PirepState::PENDING }}"><i class="ti-plus"></i>Pending</a></li>
<li><a href="{{ route('admin.pireps.index') }}"><i class="ti-plus"></i>View All</a></li> <li><a href="{{ route('admin.pireps.index') }}?search=state:{{ \App\Models\Enums\PirepState::REJECTED }}"><i class="ti-plus"></i>Rejected</a></li>
<li><a href="{{ route('admin.pireps.index') }}?search=state:{{ \App\Models\Enums\PirepState::ACCEPTED }}"><i class="ti-plus"></i>Accepted</a></li>
<li><a href="{{ route('admin.pireps.index') }}"><i class="ti-plus"></i>View All</a></li>
@endsection @endsection
@section('content') @section('content')
@include('admin.pireps.table') <div class="row" style="width: 100%">
<div class="row"> @include('admin.pireps.table')
<div class="col-12 text-center"> </div>
{{ $pireps->links('admin.pagination.default') }} <div class="row text-center" style="width: 100%">
</div> {{ $pireps->links('admin.pagination.default') }}
</div> </div>
@endsection @endsection
@include('admin.pireps.scripts') @include('admin.pireps.scripts')

150
resources/views/admin/pireps/pirep_card.blade.php
View File

@ -1,87 +1,67 @@
<div id="pirep_{{ $pirep->id }}_container"> <div id="pirep_{{ $pirep->id }}_container" class="card border-blue-bottom pirep_card_container">
<div class="card border-blue-bottom pirep_card_container"> <div class="card-block" style="min-height: 0px">
<div class="card-block" style="min-height: 0px"> <div class="row">
<div class="row"> <div class="col-sm-2 text-center">
<div class="col-sm-2 text-center"> <h5><a class="text-c" href="{{ route('admin.pireps.edit', [$pirep->id]) }}">{{ $pirep->airline->code }}{{ $pirep->ident }}</a></h5>
<h5> <div id="pirep_{{ $pirep->id }}_status_container">
<a class="text-c" @php
href="{{ route('admin.pireps.edit', [$pirep->id]) }}"> $PirepStateClass = "badge badge-info" ;
{{ $pirep->airline->code }}{{ $pirep->ident }} if($pirep->state === PirepState::PENDING ) { $PirepStateClass = "badge badge-warning" ; }
</a> if($pirep->state === PirepState::ACCEPTED ) { $PirepStateClass = "badge badge-success" ; }
</h5> if($pirep->state === PirepState::REJECTED ) { $PirepStateClass = "badge badge-danger" ; }
<div id="pirep_{{ $pirep->id }}_status_container"> @endphp
@if($pirep->state === PirepState::PENDING) <div class="{{ $PirepStateClass }}">{{ PirepState::label($pirep->state) }}</div>
<div class="badge badge-warning">
@elseif($pirep->state === PirepState::ACCEPTED)
<div class="badge badge-success">
@elseif($pirep->state === PirepState::REJECTED)
<div class="badge badge-danger">
@else
<div class="badge badge-info">
@endif
{{ PirepState::label($pirep->state) }}</div>
</div>
</div>
<div class="col-sm-10">
<div class="row">
<div class="col-sm-6">
<div>
<span class="description">
<b>DEP</b>&nbsp;
{{ $pirep->dpt_airport_id }}&nbsp;
<b>ARR</b>&nbsp;
{{ $pirep->arr_airport_id }}&nbsp;
</span>
</div>
<div>
<span class="description"><b>Flight Time</b>&nbsp;
@minutestotime($pirep->flight_time)
</span>
</div>
@if($pirep->aircraft)
<div><span class="description"><b>Aircraft</b>&nbsp;
{{ $pirep->aircraft->registration }}
({{ $pirep->aircraft->name }})
</span>
</div>
@endif
@if(filled($pirep->level))
<div>
<span class="description"><b>Flight Level</b>&nbsp;
{{ $pirep->level }}
</span>
</div>
@endif
<div>
<span class="description"><b>Filed Using</b>&nbsp;
{{ PirepSource::label($pirep->source) }}
@if(filled($pirep->source_name))
({{ $pirep->source_name }})
@endif
</span>
</div>
<div>
<span class="description"><b>File Date</b>&nbsp;
{{ show_datetime($pirep->created_at) }}
</span>
</div>
</div>
<div class="col-sm-6">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<div id="pirep_{{ $pirep->id }}_actionbar" class="pull-right">
@include('admin.pireps.actions', ['pirep' => $pirep, 'on_edit_page' => false])
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> <div class="col-sm-10">
</div> <div class="row">
<div class="col-sm-6">
<div>
<span class="description">
<b>DEP</b>&nbsp;{{ $pirep->dpt_airport_id }}&nbsp;
<b>ARR</b>&nbsp;{{ $pirep->arr_airport_id }}&nbsp;
</span>
</div>
<div>
<span class="description">
<b>Flight Time</b>&nbsp; @minutestotime($pirep->flight_time)
</span>
</div>
@if($pirep->aircraft)
<div>
<span class="description">
<b>Aircraft</b>&nbsp;{{ $pirep->aircraft->registration }} ({{ $pirep->aircraft->name }})
</span>
</div>
@endif
@if(filled($pirep->level))
<div>
<span class="description">
<b>Flight Level</b>&nbsp;{{ $pirep->level }}
</span>
</div>
@endif
<div>
<span class="description">
<b>Filed Using</b>&nbsp; {{ PirepSource::label($pirep->source) }}
@if(filled($pirep->source_name)) ({{ $pirep->source_name }}) @endif
</span>
</div>
<div>
<span class="description">
<b>File Date</b>&nbsp; {{ show_datetime($pirep->created_at) }}
</span>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<div id="pirep_{{ $pirep->id }}_actionbar" class="pull-right">
@include('admin.pireps.actions', ['pirep' => $pirep, 'on_edit_page' => false])
</div>
</div>
</div>
</div>
</div> </div>