add depart and destination for members in the groupscovoiturage
This commit is contained in:
soukainna
parent
4af0ffd3d6
commit
405038be3a
|
|
@ -114,6 +114,7 @@ views:
|
||||||
files:
|
files:
|
||||||
- web/layouts/journeys/display_groups.html
|
- web/layouts/journeys/display_groups.html
|
||||||
- web/layouts/journeys/_partials/map.html
|
- web/layouts/journeys/_partials/map.html
|
||||||
|
- web/layouts/_partials/address_autocomplete.html
|
||||||
support:
|
support:
|
||||||
request:
|
request:
|
||||||
files:
|
files:
|
||||||
|
|
|
||||||
|
|
@ -122,6 +122,87 @@
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-1">
|
||||||
|
<div class="space-y-6 lg:col-start-1 lg:col-span-1">
|
||||||
|
|
||||||
|
<div class="bg-white shadow sm:rounded-2xl">
|
||||||
|
<h2 id="timeline-title" class="text-lg font-medium text-gray-900 p-4 sm:px-6">Ajouter un passager</h2>
|
||||||
|
<div class="border-t border-gray-200 px-4 py-5 sm:px-6">
|
||||||
|
<form method="GET" >
|
||||||
|
<div x-data="{
|
||||||
|
text: '{{if .ViewState.search}}{{.ViewState.search.beneficiary.Data.first_name}} {{.ViewState.search.beneficiary.Data.last_name}}{{end}}',
|
||||||
|
beneficiariesListOpen: false,
|
||||||
|
beneficiaries: {{json .ViewState.beneficiaries}},
|
||||||
|
filteredBeneficiaries: (text) => {
|
||||||
|
if(text=='') return beneficiaries
|
||||||
|
return this.beneficiaries.filter(b => b['data']['first_name'].includes(text) || b['data']['last_name'].includes(text))
|
||||||
|
},
|
||||||
|
fields: {
|
||||||
|
beneficiaryid: {{if .ViewState.search}}'{{.ViewState.search.beneficiary.ID}}'{{else}}null{{end}},
|
||||||
|
},
|
||||||
|
selectbeneficiary(beneficiary) {
|
||||||
|
console.log(beneficiary)
|
||||||
|
this.fields.beneficiaryid = beneficiary.id
|
||||||
|
this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
|
||||||
|
this.beneficiariesListOpen = false
|
||||||
|
}
|
||||||
|
}">
|
||||||
|
<input type="hidden" name="beneficiaryid" x-model="fields.beneficiaryid">
|
||||||
|
<label for="combobox" class="block text-sm font-medium text-gray-700">Passager</label>
|
||||||
|
<div class="relative mt-1 mb-4">
|
||||||
|
<input @focus="beneficiariesListOpen = true" x-model="text" id="combobox" type="text" class="w-full rounded-2xl border border-gray-300 bg-white py-2 pl-3 pr-12 shadow-sm focus:border-co-blue focus:outline-none focus:ring-1 focus:ring-co-blue sm:text-sm" role="combobox" aria-controls="options" aria-expanded="false">
|
||||||
|
|
||||||
|
<button @click="beneficiariesListOpen = ! beneficiariesListOpen" type="button" class="absolute inset-y-0 right-0 flex items-center rounded-r-2xl px-2 focus:outline-none">
|
||||||
|
|
||||||
|
<svg class="h-5 w-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
|
||||||
|
<path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<ul x-show="beneficiariesListOpen" class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-xl bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm" id="options" role="listbox">
|
||||||
|
|
||||||
|
<template x-for="beneficiary in beneficiaries">
|
||||||
|
<li @click="selectbeneficiary(beneficiary)" class="relative cursor-default hover:bg-gray-100 select-none py-2 pl-3 pr-9 text-gray-900" id="option-0" role="option" tabindex="-1">
|
||||||
|
|
||||||
|
<span class="truncate" x-text="beneficiary.data.first_name"></span> <span class="truncate" x-text="beneficiary.data.last_name"></span>
|
||||||
|
|
||||||
|
<span class="absolute inset-y-0 right-0 flex items-center pr-4 text-co-blue">
|
||||||
|
|
||||||
|
</span>
|
||||||
|
</li>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div class="space-y-6 lg:col-start-1 lg:col-span-1 ">
|
||||||
|
|
||||||
|
{{ $departureField := "departure" }}
|
||||||
|
{{ $departureLabel := "Départ" }}
|
||||||
|
{{ $departure := .ViewState.departure }}
|
||||||
|
{{ template "address_autocomplete" dict "FieldName" $departureField "FieldLabel" $departureLabel "Address" $departure }}
|
||||||
|
|
||||||
|
{{ $destinationField := "destination" }}
|
||||||
|
{{ $destinationLabel := "Destination" }}
|
||||||
|
{{ $destination := .ViewState.destination }}
|
||||||
|
{{ template "address_autocomplete" dict "FieldName" $destinationField "FieldLabel" $destinationLabel "Address" $destination }}
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button type="submit"
|
||||||
|
class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
|
||||||
|
Ajouter
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -272,72 +353,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
|
<!-- -->
|
||||||
<div class="space-y-6 lg:col-start-1 lg:col-span-1">
|
|
||||||
|
|
||||||
<div class="bg-white shadow sm:rounded-2xl">
|
|
||||||
<h2 id="timeline-title" class="text-lg font-medium text-gray-900 p-4 sm:px-6">Ajouter un passager</h2>
|
|
||||||
<div class="border-t border-gray-200 px-4 py-5 sm:px-6">
|
|
||||||
<form method="GET" >
|
|
||||||
<div x-data="{
|
|
||||||
text: '{{if .ViewState.search}}{{.ViewState.search.beneficiary.Data.first_name}} {{.ViewState.search.beneficiary.Data.last_name}}{{end}}',
|
|
||||||
beneficiariesListOpen: false,
|
|
||||||
beneficiaries: {{json .ViewState.beneficiaries}},
|
|
||||||
filteredBeneficiaries: (text) => {
|
|
||||||
if(text=='') return beneficiaries
|
|
||||||
return this.beneficiaries.filter(b => b['data']['first_name'].includes(text) || b['data']['last_name'].includes(text))
|
|
||||||
},
|
|
||||||
fields: {
|
|
||||||
beneficiaryid: {{if .ViewState.search}}'{{.ViewState.search.beneficiary.ID}}'{{else}}null{{end}},
|
|
||||||
},
|
|
||||||
selectbeneficiary(beneficiary) {
|
|
||||||
console.log(beneficiary)
|
|
||||||
this.fields.beneficiaryid = beneficiary.id
|
|
||||||
this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
|
|
||||||
this.beneficiariesListOpen = false
|
|
||||||
}
|
|
||||||
}">
|
|
||||||
<input type="hidden" name="beneficiaryid" x-model="fields.beneficiaryid">
|
|
||||||
<label for="combobox" class="block text-sm font-medium text-gray-700">Passager</label>
|
|
||||||
<div class="relative mt-1 mb-4">
|
|
||||||
<input @focus="beneficiariesListOpen = true" x-model="text" id="combobox" type="text" class="w-full rounded-2xl border border-gray-300 bg-white py-2 pl-3 pr-12 shadow-sm focus:border-co-blue focus:outline-none focus:ring-1 focus:ring-co-blue sm:text-sm" role="combobox" aria-controls="options" aria-expanded="false">
|
|
||||||
|
|
||||||
<button @click="beneficiariesListOpen = ! beneficiariesListOpen" type="button" class="absolute inset-y-0 right-0 flex items-center rounded-r-2xl px-2 focus:outline-none">
|
|
||||||
|
|
||||||
<svg class="h-5 w-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
|
|
||||||
<path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<ul x-show="beneficiariesListOpen" class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-xl bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm" id="options" role="listbox">
|
|
||||||
|
|
||||||
<template x-for="beneficiary in beneficiaries">
|
|
||||||
<li @click="selectbeneficiary(beneficiary)" class="relative cursor-default hover:bg-gray-100 select-none py-2 pl-3 pr-9 text-gray-900" id="option-0" role="option" tabindex="-1">
|
|
||||||
|
|
||||||
<span class="truncate" x-text="beneficiary.data.first_name"></span> <span class="truncate" x-text="beneficiary.data.last_name"></span>
|
|
||||||
|
|
||||||
<span class="absolute inset-y-0 right-0 flex items-center pr-4 text-co-blue">
|
|
||||||
|
|
||||||
</span>
|
|
||||||
</li>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button type="submit"
|
|
||||||
class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
|
|
||||||
Ajouter
|
|
||||||
</button>
|
|
||||||
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue