Compare commits
1
Commits
91a6873b64
...
1.4.4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f31f1bc2fc |
@@ -58,12 +58,17 @@ class SearchController extends Controller
|
||||
{
|
||||
$q = request('q', '');
|
||||
$len = strlen($q);
|
||||
$includeInactive = request()->boolean('include_inactive');
|
||||
$showClosed = request()->boolean('show_closed');
|
||||
$showNoCode = request()->boolean('show_no_code');
|
||||
|
||||
if ($len < 3) return [];
|
||||
|
||||
return Airport::with('region.country')
|
||||
->when(!$includeInactive, fn($query) => $query->where('active', true))
|
||||
->when(!$showClosed, fn($query) => $query->where('active', true))
|
||||
->when(!$showNoCode, fn($query) => $query->where(function ($sub) {
|
||||
$sub->whereNotNull('iata_code')
|
||||
->orWhereNotNull('icao_code');
|
||||
}))
|
||||
->when($len === 3, fn($query) => $query->where('iata_code', 'ilike', $q))
|
||||
->when($len >= 4, fn($query) => $query->where(function ($sub) use ($q, $len) {
|
||||
$sub->when($len === 4, fn($s) => $s->where('icao_code', 'ilike', $q))
|
||||
@@ -75,6 +80,13 @@ class SearchController extends Controller
|
||||
WHEN active THEN 0
|
||||
ELSE 1
|
||||
END
|
||||
")
|
||||
->orderByRaw("
|
||||
CASE
|
||||
WHEN iata_code IS NOT NULL AND icao_code IS NOT NULL THEN 0
|
||||
WHEN iata_code IS NOT NULL OR icao_code IS NOT NULL THEN 1
|
||||
ELSE 2
|
||||
END
|
||||
")
|
||||
->orderByRaw("
|
||||
CASE
|
||||
|
||||
@@ -12,10 +12,14 @@ const model = defineModel<{ value: number, title: string, country_code: string }
|
||||
|
||||
const airportOptions = ref(props.prefilledOptions ?? [])
|
||||
const autocompleteRef = ref<any>(null)
|
||||
const includeInactive = ref(true)
|
||||
const showClosed = ref(false)
|
||||
const showNoCode = ref(false)
|
||||
const lastQuery = ref('')
|
||||
const menuOpen = ref(false)
|
||||
|
||||
const onFocus = () => {
|
||||
menuOpen.value = true
|
||||
|
||||
nextTick(() => {
|
||||
const input = autocompleteRef.value?.$el?.querySelector('input')
|
||||
input?.select()
|
||||
@@ -35,14 +39,15 @@ const searchAirports = async (query: string) => {
|
||||
const { data } = await axios.get('/search/airports', {
|
||||
params: {
|
||||
q: query,
|
||||
include_inactive: includeInactive.value ? 1 : undefined,
|
||||
show_closed: showClosed.value ? 1 : undefined,
|
||||
show_no_code: showNoCode.value ? 1 : undefined,
|
||||
},
|
||||
})
|
||||
airportOptions.value = data
|
||||
}
|
||||
|
||||
// Re-run the last search when the checkbox is toggled, so results update immediately
|
||||
watch(includeInactive, () => {
|
||||
// Re-run the last search when either checkbox is toggled, so results update immediately
|
||||
watch([showClosed, showNoCode], () => {
|
||||
if (lastQuery.value) searchAirports(lastQuery.value)
|
||||
})
|
||||
</script>
|
||||
@@ -51,6 +56,7 @@ watch(includeInactive, () => {
|
||||
<v-autocomplete
|
||||
ref="autocompleteRef"
|
||||
v-model="model"
|
||||
v-model:menu="menuOpen"
|
||||
:label="label ?? 'Airport'"
|
||||
:items="airportOptions"
|
||||
:error-messages="errorMessages"
|
||||
@@ -62,6 +68,7 @@ watch(includeInactive, () => {
|
||||
clearable
|
||||
hide-no-data
|
||||
return-object
|
||||
autocomplete="off"
|
||||
:custom-filter="() => true"
|
||||
>
|
||||
<template #prepend-inner>
|
||||
@@ -69,6 +76,27 @@ watch(includeInactive, () => {
|
||||
<span v-if="model" :class="`fi fi-${model.country_code}`"></span>
|
||||
</span>
|
||||
</template>
|
||||
|
||||
<template #prepend-item>
|
||||
<div class="px-4 py-1 d-flex align-center" style="gap: 16px;" @mousedown.prevent>
|
||||
<v-checkbox
|
||||
v-model="showClosed"
|
||||
label="Show Closed Airports"
|
||||
density="compact"
|
||||
hide-details
|
||||
style="flex: none; transform: scale(0.65); transform-origin: left center;"
|
||||
/>
|
||||
<v-checkbox
|
||||
v-model="showNoCode"
|
||||
label="Show Airports with No Code"
|
||||
density="compact"
|
||||
hide-details
|
||||
style="flex: none; transform: scale(0.65); transform-origin: left center;"
|
||||
/>
|
||||
</div>
|
||||
<v-divider class="mt-1" />
|
||||
</template>
|
||||
|
||||
<template #item="{ item, props: itemProps }">
|
||||
<v-list-item v-bind="itemProps">
|
||||
<template #prepend>
|
||||
|
||||
Reference in New Issue
Block a user