From 883e8786e0ad0a0ecd01b431ccfe05a789e75beb Mon Sep 17 00:00:00 2001 From: "B.Fatih KOZ" <74361521+FatihKoz@users.noreply.github.com> Date: Sun, 6 Dec 2020 04:27:03 +0300 Subject: [PATCH] Formatting on admin pirep page #952 * 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. --- resources/views/admin/pireps/index.blade.php | 20 +-- .../views/admin/pireps/pirep_card.blade.php | 150 ++++++++---------- 2 files changed, 76 insertions(+), 94 deletions(-) diff --git a/resources/views/admin/pireps/index.blade.php b/resources/views/admin/pireps/index.blade.php index 10c57217..292bd917 100644 --- a/resources/views/admin/pireps/index.blade.php +++ b/resources/views/admin/pireps/index.blade.php @@ -2,16 +2,18 @@ @section('title', 'Pilot Reports') @section('actions') -
  • PIREP Fields
    • -
  • Pending
    • -
  • View All
    • +
  • PIREP Fields
    • +
  • Pending
    • +
  • Rejected
    • +
  • Accepted
    • +
  • View All
    • @endsection @section('content') - @include('admin.pireps.table') -
    -
    - {{ $pireps->links('admin.pagination.default') }} -
    -
    +
    + @include('admin.pireps.table') +
    +
    + {{ $pireps->links('admin.pagination.default') }} +
    @endsection @include('admin.pireps.scripts') diff --git a/resources/views/admin/pireps/pirep_card.blade.php b/resources/views/admin/pireps/pirep_card.blade.php index d8afaf41..4cca4dd3 100644 --- a/resources/views/admin/pireps/pirep_card.blade.php +++ b/resources/views/admin/pireps/pirep_card.blade.php @@ -1,87 +1,67 @@ -
    -
    -
    -
    -
    -
    - - {{ $pirep->airline->code }}{{ $pirep->ident }} - -
    -
    - @if($pirep->state === PirepState::PENDING) -
    - @elseif($pirep->state === PirepState::ACCEPTED) -
    - @elseif($pirep->state === PirepState::REJECTED) -
    - @else -
    - @endif - {{ PirepState::label($pirep->state) }}
    -
    -
    -
    -
    -
    -
    - - DEP  - {{ $pirep->dpt_airport_id }}  - ARR  - {{ $pirep->arr_airport_id }}  - -
    -
    - Flight Time  - @minutestotime($pirep->flight_time) - -
    - @if($pirep->aircraft) -
    Aircraft  - {{ $pirep->aircraft->registration }} - ({{ $pirep->aircraft->name }}) - -
    - @endif - @if(filled($pirep->level)) -
    - Flight Level  - {{ $pirep->level }} - -
    - @endif -
    - Filed Using  - {{ PirepSource::label($pirep->source) }} - @if(filled($pirep->source_name)) - ({{ $pirep->source_name }}) - @endif - -
    -
    - File Date  - {{ show_datetime($pirep->created_at) }} - -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    - @include('admin.pireps.actions', ['pirep' => $pirep, 'on_edit_page' => false]) -
    -
    -
    -
    +
    +
    +
    +
    +
    {{ $pirep->airline->code }}{{ $pirep->ident }}
    +
    + @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 +
    {{ PirepState::label($pirep->state) }}
    -
    -
    -
    +
    +
    +
    +
    +
    + + DEP {{ $pirep->dpt_airport_id }}  + ARR {{ $pirep->arr_airport_id }}  + +
    +
    + + Flight Time  @minutestotime($pirep->flight_time) + +
    + @if($pirep->aircraft) +
    + + Aircraft {{ $pirep->aircraft->registration }} ({{ $pirep->aircraft->name }}) + +
    + @endif + @if(filled($pirep->level)) +
    + + Flight Level {{ $pirep->level }} + +
    + @endif +
    + + Filed Using  {{ PirepSource::label($pirep->source) }} + @if(filled($pirep->source_name)) ({{ $pirep->source_name }}) @endif + +
    +
    + + File Date  {{ show_datetime($pirep->created_at) }} + +
    +
    +
    +
    +
    +
    +
    +
    + @include('admin.pireps.actions', ['pirep' => $pirep, 'on_edit_page' => false]) +
    +
    +
    +