From c4dee07b7f49fcf47bc261dcd6cc8b7923e917f9 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Sun, 17 Jan 2021 21:25:44 -0500
Subject: [PATCH] Cleanup flight search code

---
 .../Controllers/Frontend/FlightController.php |  2 +
 .../layouts/default/flights/nav.blade.php     |  9 ++---
 .../layouts/default/flights/search.blade.php  | 39 ++++++-------------
 3 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/app/Http/Controllers/Frontend/FlightController.php b/app/Http/Controllers/Frontend/FlightController.php
index d3e2e79d..a6fa013e 100644
--- a/app/Http/Controllers/Frontend/FlightController.php
+++ b/app/Http/Controllers/Frontend/FlightController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Frontend;
 
 use App\Contracts\Controller;
 use App\Models\Bid;
+use App\Models\Enums\FlightType;
 use App\Repositories\AirlineRepository;
 use App\Repositories\AirportRepository;
 use App\Repositories\Criteria\WhereCriteria;
@@ -120,6 +121,7 @@ class FlightController extends Controller
             'saved'         => $saved_flights,
             'subfleets'     => $this->subfleetRepo->selectBoxList(true),
             'flight_number' => $request->input('flight_number'),
+            'flight_types'  => FlightType::select(true),
             'flight_type'   => $request->input('flight_type'),
             'arr_icao'      => $request->input('arr_icao'),
             'dep_icao'      => $request->input('dep_icao'),
diff --git a/resources/views/layouts/default/flights/nav.blade.php b/resources/views/layouts/default/flights/nav.blade.php
index ea29a04d..086ba0f6 100644
--- a/resources/views/layouts/default/flights/nav.blade.php
+++ b/resources/views/layouts/default/flights/nav.blade.php
@@ -1,7 +1,6 @@
-<div class="card">
-  <div class="card-block" style="min-height: 0px; display: flex; justify-content: center; align-items: center;">
-    <div class="form-group text-right">
-      <a href="{{ route('frontend.flights.bids') }}" class="btn btn-outline-primary">{{ trans_choice('flights.mybid', 2) }}</a>
-    </div>
+<div class="text-right">
+  <div class="form-group text-right">
+    <a href="{{ route('frontend.flights.bids') }}"
+       class="btn btn-outline-primary">{{ trans_choice('flights.mybid', 2) }}</a>
   </div>
 </div>
diff --git a/resources/views/layouts/default/flights/search.blade.php b/resources/views/layouts/default/flights/search.blade.php
index c0472e4a..fe842e08 100644
--- a/resources/views/layouts/default/flights/search.blade.php
+++ b/resources/views/layouts/default/flights/search.blade.php
@@ -1,40 +1,25 @@
-<h3 class="description">@lang('flights.search')</h3>
-<div class="card border-blue-bottom">
-  <div class="card-body ml-1 mr-1" style="min-height: 0px; display: flex; justify-content: center; align-items: center;">
+<h4 class="description">@lang('flights.search')</h4>
+<div class="row">
+  <div class="col-12">
     <div class="form-group search-form">
       {{ Form::open([
               'route' => 'frontend.flights.search',
               'method' => 'GET',
-              'class'=>'form-inline'
       ]) }}
+
       <div class="mt-1">
-        <p>@lang('common.airline')</p>
-        {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
+        <div class="form-group">
+          <p>@lang('common.airline')</p>
+          {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control form-control-sm select2']) }}
+        </div>
       </div>
 
-      <div class="form-group">
-        <label>@lang('flights.flighttype')</label>
-        <select id="flight_type" name="flight_type" class="custom-select select2">
-          <option value=""></option>
-          <option value="J">@lang('flights.type.pass_scheduled')</option>
-          <option value="G">@lang('flights.type.pass_addtl')</option>
-          <option value="C">@lang('flights.type.charter_pass_only')</option>
-          <option value="O">@lang('flights.type.charter_special')</option>
-          <option value="E">@lang('flights.type.special_vip')</option>
-          <option value="F">@lang('flights.type.cargo_scheduled')</option>
-          <option value="A">@lang('flights.type.addtl_cargo_mail')</option>
-          <option value="H">@lang('flights.type.charter_cargo')</option>
-          <option value="M">@lang('flights.type.mail_service')</option>
-          <option value="I">@lang('flights.type.ambulance')</option>
-          <option value="K">@lang('flights.type.training_flight')</option>
-          <option value="P">@lang('flights.type.positioning')</option>
-          <option value="T">@lang('flights.type.technical_test')</option>
-          <option value="X">@lang('flights.type.technical_stop')</option>
-          <option value="W">@lang('flights.type.military')</option>
-        </select>
+      <div class="mt-1">
+        <p>@lang('flights.flighttype')</p>
+        {{ Form::select('flight_type', $flight_types, null , ['class' => 'form-control select2']) }}
       </div>
 
-      <div>
+      <div class="mt-1">
         <p>@lang('flights.flightnumber')</p>
         {{ Form::text('flight_number', null, ['class' => 'form-control']) }}
       </div>