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

Admin blade improvements (#1321)

Browse Source 
* Update search.blade.php

Used select2 for airports, fixed grid layout

* Update actions.blade.php

Fixed button placing

* Update pirep_card.blade.php

Added user id before the name, made name optional so if page hits an hard deleted user's pirep it will not fail. Also improved the flight level check.
This commit is contained in:
B.Fatih KOZ 2021-09-29 17:37:05 +03:00 committed by GitHub
parent 0b27635fcb
commit 7a29630f57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
resources/views/admin/flights/search.blade.php
View File

@ -3,21 +3,31 @@
<div class="col-sm-12"> <div class="col-sm-12">
<div class="form-group"> <div class="form-group">
{{ Form::open(['route' => 'admin.flights.index', 'method' => 'GET', 'class'=>'form-inline pull-right']) }} {{ Form::open(['route' => 'admin.flights.index', 'method' => 'GET', 'class'=>'form-inline pull-right']) }}
&nbsp;&nbsp; <div class="row">
{{ Form::label('airlines', 'Airline:') }} <div class="form-group col-sm-2">
{{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }} {{ Form::label('airlines', 'Airline:') }}
{{ Form::label('flight_number', 'Flight Number:') }} {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
{{ Form::text('flight_number', null, ['class' => 'form-control']) }} </div>
&nbsp; <div class="form-group input-group-sm col-sm-2">
{{ Form::label('dpt_airport_id', 'Departure:') }} {{ Form::label('flight_number', 'Flight Number:') }}
{{ Form::select('dpt_airport_id', $airports, null , ['class' => 'form-control']) }} {{ Form::text('flight_number', null, ['class' => 'form-control']) }}
&nbsp; </div>
{{ Form::label('arr_airport_id', 'Arrival:') }} <div class="form-group col-sm-4">
{{ Form::select('arr_airport_id', $airports, null , ['class' => 'form-control']) }} {{ Form::label('dpt_airport_id', 'Departure:') }}
&nbsp; {{ Form::select('dpt_airport_id', $airports, null , ['class' => 'form-control select2']) }}
{{ Form::submit('find', ['class' => 'btn btn-primary']) }} </div>
&nbsp; <div class="form-group col-sm-4">
<a href="{{ route('admin.flights.index') }}">clear</a> {{ Form::label('arr_airport_id', 'Arrival:') }}
{{ Form::select('arr_airport_id', $airports, null , ['class' => 'form-control select2']) }}
</div>
</div>
<div class="row text-right">
<div class="col-sm-12">
{{ Form::submit('find', ['class' => 'btn btn-primary']) }}
&nbsp;&nbsp;
<a href="{{ route('admin.flights.index') }}">clear</a>
</div>
</div>
{{ Form::close() }} {{ Form::close() }}
</div> </div>
</div> </div>

38
resources/views/admin/pireps/actions.blade.php
View File

@ -1,7 +1,7 @@
<table class=""> <table class="table" style="border-style: hidden; margin-bottom: 0px;">
<tr> <tr style="border-style: hidden;">
<td> @if ($pirep->state === PirepState::PENDING || $pirep->state === PirepState::REJECTED)
@if($pirep->state === PirepState::PENDING || $pirep->state === PirepState::REJECTED) <td>
{{ Form::open(['url' => route('admin.pirep.status', [$pirep->id]), {{ Form::open(['url' => route('admin.pirep.status', [$pirep->id]),
'method' => 'post', 'method' => 'post',
'name' => 'accept_'.$pirep->id, 'name' => 'accept_'.$pirep->id,
@ -11,11 +11,9 @@
'class' => $on_edit_page ? 'pirep_change_status': 'pirep_submit_status']) }} 'class' => $on_edit_page ? 'pirep_change_status': 'pirep_submit_status']) }}
{{ Form::button('Accept', ['type' => 'submit', 'class' => 'btn btn-success']) }} {{ Form::button('Accept', ['type' => 'submit', 'class' => 'btn btn-success']) }}
{{ Form::close() }} {{ Form::close() }}
@endif </td>
</td> @elseif ($pirep->state === PirepState::PENDING || $pirep->state === PirepState::ACCEPTED)
<td>&nbsp;</td> <td>
<td>
@if($pirep->state === PirepState::PENDING || $pirep->state === PirepState::ACCEPTED)
{{ Form::open(['url' => route('admin.pirep.status', [$pirep->id]), {{ Form::open(['url' => route('admin.pirep.status', [$pirep->id]),
'method' => 'post', 'method' => 'post',
'name' => 'reject_'.$pirep->id, 'name' => 'reject_'.$pirep->id,
@ -25,8 +23,8 @@
'class' => $on_edit_page ? 'pirep_change_status': 'pirep_submit_status']) }} 'class' => $on_edit_page ? 'pirep_change_status': 'pirep_submit_status']) }}
{{ Form::button('Reject', ['type' => 'submit', 'class' => 'btn btn-warning']) }} {{ Form::button('Reject', ['type' => 'submit', 'class' => 'btn btn-warning']) }}
{{ Form::close() }} {{ Form::close() }}
@endif </td>
</td> @endif
<td> <td>
{{ Form::open(['url' => route('admin.pireps.destroy', [$pirep->id]), {{ Form::open(['url' => route('admin.pireps.destroy', [$pirep->id]),
'method' => 'delete', 'method' => 'delete',
@ -40,20 +38,18 @@
@if ($on_edit_page === false) @if ($on_edit_page === false)
<td> <td>
<form action="{{ route('admin.pireps.edit', [$pirep->id]) }}"> <form action="{{ route('admin.pireps.edit', [$pirep->id]) }}">
<button type="submit" <button type="submit" class='btn btn-info'>
class='btn btn-info'>
<i class="fas fa-pencil-alt"></i>&nbsp;&nbsp;Edit <i class="fas fa-pencil-alt"></i>&nbsp;&nbsp;Edit
</button> </button>
</form> </form>
</td> </td>
@endif @endif
<td> <td>
<form action="{{ route('frontend.pireps.show', [$pirep->id]) }}" target="_blank"> <form action="{{ route('frontend.pireps.show', [$pirep->id]) }}" target="_blank">
<button type="submit" <button type="submit" class='btn btn-success'>
class='btn btn-success'> <i class="fas fa-eye"></i>&nbsp;&nbsp; View Pirep
<i class="fas fa-eye"></i>&nbsp;&nbsp; View Pirep </button>
</button> </form>
</form> </td>
</td>
</tr> </tr>
</table> </table>

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

@ -18,7 +18,7 @@
<div class="col-sm-6"> <div class="col-sm-6">
<div> <div>
<span class="description"> <span class="description">
<b>Pilot</b>&nbsp;{{ $pirep->user->name }}&nbsp; <b>Pilot</b>&nbsp;{{ '('.$pirep->user_id.') '.optional($pirep->user)->name }}
</span> </span>
</div> </div>
<div> <div>
@ -35,11 +35,11 @@
@if($pirep->aircraft) @if($pirep->aircraft)
<div> <div>
<span class="description"> <span class="description">
<b>Aircraft</b>&nbsp;{{ $pirep->aircraft->registration }} ({{ $pirep->aircraft->name }}) <b>Aircraft</b>&nbsp;{{ $pirep->aircraft->registration }} @if($pirep->aircraft->registration != $pirep->aircraft->name) '{{ $pirep->aircraft->name }}' @endif
</span> </span>
</div> </div>
@endif @endif
@if(filled($pirep->level)) @if(filled($pirep->level) && $pirep->level > 10)
<div> <div>
<span class="description"> <span class="description">
<b>Flight Level</b>&nbsp;{{ $pirep->level }} <b>Flight Level</b>&nbsp;{{ $pirep->level }}