Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix For Issue #952 / Formatting on admin pirep page #953

Merged
merged 2 commits into from
Dec 6, 2020
Merged

Fix For Issue #952 / Formatting on admin pirep page #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3fc9f8
Fix For Issue #952 / Admin Pirep Display
FatihKoz Dec 6, 2020
1598a35
Fix and Update for Admin Pirep Index
FatihKoz Dec 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions resources/views/admin/pireps/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@

@section('title', 'Pilot Reports')
@section('actions')
<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') }}"><i class="ti-plus"></i>View All</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=state:{{ \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::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
@section('content')
@include('admin.pireps.table')
<div class="row">
<div class="col-12 text-center">
{{ $pireps->links('admin.pagination.default') }}
</div>
</div>
<div class="row" style="width: 100%">
@include('admin.pireps.table')
</div>
<div class="row text-center" style="width: 100%">
{{ $pireps->links('admin.pagination.default') }}
</div>
@endsection
@include('admin.pireps.scripts')
150 changes: 65 additions & 85 deletions resources/views/admin/pireps/pirep_card.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,87 +1,67 @@
<div id="pirep_{{ $pirep->id }}_container">
<div class="card border-blue-bottom pirep_card_container">
<div class="card-block" style="min-height: 0px">
<div class="row">
<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>
<div id="pirep_{{ $pirep->id }}_status_container">
@if($pirep->state === PirepState::PENDING)
<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 id="pirep_{{ $pirep->id }}_container" class="card border-blue-bottom pirep_card_container">
<div class="card-block" style="min-height: 0px">
<div class="row">
<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>
<div id="pirep_{{ $pirep->id }}_status_container">
@php
$PirepStateClass = "badge badge-info" ;
if($pirep->state === PirepState::PENDING ) { $PirepStateClass = "badge badge-warning" ; }
if($pirep->state === PirepState::ACCEPTED ) { $PirepStateClass = "badge badge-success" ; }
if($pirep->state === PirepState::REJECTED ) { $PirepStateClass = "badge badge-danger" ; }
@endphp
<div class="{{ $PirepStateClass }}">{{ PirepState::label($pirep->state) }}</div>
</div>
</div>
</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>
</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>