modify some style and add the update file to delete passenger

This commit is contained in:
soukainna 2023-01-17 15:09:41 +01:00
parent ac413680e0
commit e5382917cd
6 changed files with 152 additions and 172 deletions

View File

@ -115,6 +115,9 @@ views:
- web/layouts/_partials/address_autocomplete.html
- web/layouts/journeys/display_groups.html
- web/layouts/journeys/_partials/map.html
update:
files:
- web/layouts/journeys/update_groups.html
support:
request:
files:

View File

@ -25,6 +25,11 @@
<input id="ar" type="hidden" value="{{.ViewState.group.Data.arrive.geometry.coordinates}}">
<input id="des" type="hidden" value="{{.ViewState.group.Data.depart.geometry.coordinates}}">
<input id="arri" type="hidden" value="{{.ViewState.group.Data.arrive.geometry.coordinates}}">
{{range .ViewState.beneficiaries}}
{{if (index $.ViewState.groups .ID) }}
<input id="passager" type="hidden"value="{{(index $.ViewState.groups .ID).Data.depart.geometry.coordinates}}">
{{end}}
{{end}}
<div>
<span id="polyline-info-content"></span>
@ -100,7 +105,7 @@ function errorRoute() {
var br = (wwr[0])
destCoord = [r, br]
map.setZoom(9);
//console.log("Ici : " [depCoord[0],depCoord[1]],[destCoord[0],destCoord[1]])
map.fitBounds([[depCoord[0],depCoord[1]],[destCoord[0],destCoord[1]]],{padding: 40});
}
@ -115,10 +120,8 @@ function errorRoute() {
if (rideDuration != null && rideDistance != null) {
document.getElementById("polyline-info-content").innerHTML = "Durée : " + (Math.round(((rideDuration / 60) + Number.EPSILON) * 100) / 100) + " min<br/>Distance : " + rideDistance + " km";
}
// $("#polyline-str").val(polylineString);
// $("#ride-duration").val(rideDuration);
// $("#ride-distance").val(rideDistance);
console.log("rideDuration :", rideDuration, ", rideDistance ",rideDistance)
// console.log("rideDuration :", rideDuration, ", rideDistance ",rideDistance)
if(polylineCoord != null && polylineCoord.length > 0 ){
drawPolylineOnMap(polylineCoord)
@ -130,10 +133,9 @@ function createPolyline() {
destination = [r, br]
console.log("origin : ", origin)
if(origin != null && destination != null && origin != "" && destination != ""){
console.log("Get polyline infos")
var hash_locs = [];
hash_locs.push({
'lat' : (origin[1]),
@ -156,17 +158,15 @@ function createPolyline() {
success : retrievePolylineInfo,
error: routeNotOptimized(body),
});
console.log("JSON.stringify(body)",JSON.stringify(body))
}
}
var depCoord = []
var destCoord = []
var other = []
var a, b
depCoord = [a, b]
console.log("yeeesss: ", a)
//////////////////////////////
//mapboxgl.accessToken = 'pk.eyJ1Ijoic291a2FpbmFsYWZkaWxpIiwiYSI6ImNsYjB1djUxNjAwaWQzdm82dnJ5OXJrZzcifQ.0i8xkskwRps3W1PFwApL_Q';
const map = new maplibregl.Map({
container: 'map',
style: 'https://api.maptiler.com/maps/streets/style.json?key=get_your_own_OpIi9ZULNHzrESv6T2vL',
@ -175,9 +175,24 @@ function createPolyline() {
});
map.addControl(new maplibregl.NavigationControl(), 'bottom-right');
var markers = []
var pass = []
//////////////////Code to add position in the map///////////////
var ii = document.querySelectorAll("#passager")
for (var i = 0; i < ii.length; i++){
var v = ii[i].value
var val = ii[i].value.split(' ')
const wl = val[0].split('[')
const wwl = val[1].split(']')
al = (wl[1]);
bl = (wwl[0])
other = [al, bl]
{var marker = new maplibregl.Marker()
.setLngLat([al, bl])//position of passager
.addTo(map);
pass.push(marker)}
}
//destination
var i = document.getElementById('de').value
var words = i.split(' ');
const w = words[0].split('[')
@ -185,8 +200,6 @@ function createPolyline() {
a = (w[1]);
b = (ww[0])
depCoord = [a, b]
console.log("yeeesss: ", depCoord[0])
console.log(b)
//arrive
var ar = document.getElementById('ar').value
var wordsr = ar.split(' ');
@ -195,7 +208,7 @@ function createPolyline() {
var r = (wr[1]);
var br = (wwr[0])
destCoord = [r, br]
console.log(br)
/////
{var marker = new maplibregl.Marker();
marker.setLngLat([a, b])//starting position
@ -205,7 +218,7 @@ function createPolyline() {
center: [a, b]
});
console.log("again: ", a , b)
markers.push(marker)
createPolyline()
}

View File

@ -63,7 +63,7 @@
</div>
<div class="col-span-5">
<label for="name" class="block text-sm font-medium text-gray-700">Nombre maximum de personne</label>
<input type="text" name="number" id="number"
<input type="number" name="number" id="number"
class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
x-model="fields.number" @blur="validateField('number')"
:class="formValidation.fields.number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
@ -157,53 +157,31 @@
<p class="mt-1 text-sm text-gray-500">Informations liés a la planification de groupe, veuillez cocher la solution qui vous convient </p>
</div>
<div class="mt-5 md:mt-0 md:col-span-2">
<!-- <div class="flex items-start">
<div class="flex items-center h-5">
<input id="ponctuelleuelle" name="ponctuelleuelle" type="checkbox"
class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded">
</div>
<div class="ml-3 text-sm">
<label for="ponctuelleuelle" class=" text-lg font-medium leading-6 text-gray-900">ponctuelleuelle</label>
</div>
</div> -->
<!-- $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ -->
<div class="mt-5 md:mt-0 md:col-span-2">
<div x-data="{selectedListID: ''}" x-init="$watch('selectedListID', value => console.log(value))">
<input type="radio" value="recurrent" x-model="selectedListID">&nbsp Recurrent &nbsp&nbsp
<input type="radio" value="ponctuelle" x-model="selectedListID">&nbsp Ponctuelle
<!-- <p>value: <span x-text="selectedListID" name="selectedListID"></span></p> -->
<input id="t" :name="selectedListID" type="hidden" :value="selectedListID">
<!-- <div x-data="{lists: [{id: 'ponctuelle', name: 'ponctuelle'}, {id: 'recurrent', name: 'recurrent'}], selectedListID: ''}">
<template x-for="list in lists" :key="list.id">
<div>
<input x-model="selectedListID" type="radio" :value="list.id.toString()" :id="list.name" >
<label :for="list.name" x-text="list.name"></label>
</div>
</template> -->
<input id="t" :name="selectedListID" type="hidden" :value="selectedListID">
<div class="sm:col-span-6" x-show="selectedListID == 'ponctuelle'" >
<div class="py-4 grid grid-cols-2">
<div class="lg:col-span-1">
<label for="departdate" class="block text-sm font-medium text-gray-700">le</label>
<div class="mt-1">
<input type="date" id="departdate" name="departdate"
class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-l-2xl border-r-1" class="sr-only">
</div>
<!-- <p name="selectedListID">Selected value: <code x-text="selectedListID" ></code></p> -->
<!-- ******************************* -->
<div class="sm:col-span-6" x-show="selectedListID == 'ponctuelle'" >
<div class="py-4 grid grid-cols-2">
<div class="lg:col-span-1">
<label for="departdate" class="block text-sm font-medium text-gray-700">le</label>
<div class="mt-1">
<input type="date" id="departdate" name="departdate"
class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-l-2xl border-r-1" class="sr-only">
</div>
</div>
<div class="lg:col-span-1">
<label for="departtime" class="block text-sm font-medium text-gray-700">A</label>
<div class="mt-1">
<input type="time" id="departtime" name="departtime"
class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-r-2xl border-l-0">
<div class="lg:col-span-1">
<label for="departtime" class="block text-sm font-medium text-gray-700">A</label>
<div class="mt-1">
<input type="time" id="departtime" name="departtime"
class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-r-2xl border-l-0">
</div>
</div>
</div>
</div>
</div>
<!-- $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ -->
<div x-show="selectedListID == 'recurrent'">

View File

@ -1,5 +1,6 @@
{{define "content"}}
<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
<div x-data="{dialog: false, id: ''}">
<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
<h1 class="text-2xl font-semibold text-gray-900">Gestion du groupe</h1>
<div class="sm:flex sm:items-center">
<div class="sm:flex-auto">
@ -124,12 +125,15 @@
</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">
{{if gt .ViewState.group.Data.number .ViewState.number}}
<form method="GET" >
<div x-data="{
text: '{{if .ViewState.search}}{{.ViewState.search.beneficiary.Data.first_name}} {{.ViewState.search.beneficiary.Data.last_name}}{{end}}',
@ -197,39 +201,24 @@
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>
{{else}}
<p>Vous avez atteint le nombre maximum de passagers</p>
{{end}}
</form>
</div>
</div>
</div>
</div>
</div>
<!-- *********************************** -->
<div class="lg:col-start-2 lg:col-span-2" x-data="{
state: {{.ViewState.list.JSONWithLimits 0 10}},
current: 0,
nb_pages() {
let nbEl = this.state.count
return Math.ceil(nbEl/10)
},
async paginate(page) {
let start = (page-1)*10
if(start < 0|| start > this.state.count) {
return
}
let resp = await fetch('/api/cache/' + this.state.cache_id + '?limits.min=' + start + '&limits.max=' + (start+10))
let data = await resp.json()
this.state.beneficiaries = data
this.current=page-1
this.state.group = data
}
}">
<div class="lg:col-start-2 lg:col-span-2">
<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-2 mb-4">
<div class="sm:flex sm:items-center">
<div class="sm:flex-auto">
@ -237,7 +226,6 @@
</div>
</div>
</div>
<!-- $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ -->
<div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8 mt-2">
<!-- -->
@ -253,107 +241,83 @@
Nom du bénéficiaire
</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
Téléphone
Départ
</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
Email
Déstination
</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
</th>
</tr>
</thead>
<tbody class="divide-y divide-gray-200 bg-white">
<template x-for="beneficiary in state.beneficiaries">
{{range .ViewState.beneficiaries}}
{{if (index $.ViewState.groups .ID) }}
<tr>
<td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
<div class="flex items-center">
<div class="ml-4">
<div class="font-medium text-gray-900"><span
x-text="beneficiary.data.first_name"></span> <span
x-text="beneficiary.data.last_name"></span></div>
<div class="h-10 w-10 flex-shrink-0">
<img class="h-10 w-10 rounded-co"
:src="'/app/beneficiaries/' + `{{.ID}}`+ '/picture'" alt="">
</div>
</div>
<a :href="'/app/beneficiaries/' + `{{.ID}}`">
<div class="flex items-center">
<div class="ml-4">
<div class="text-co-blue hover:text-co-blue"><span
>{{.Data.first_name}}</span> <span
>{{.Data.last_name}}</span></div>
</div>
</div></a>
</td>
<td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
{{if (index $.ViewState.groups .ID).Data.depart}}
<div class="text-gray-900" >{{(index $.ViewState.groups .ID).Data.depart.properties.label}}</div>
{{else}}
<div class="text-gray-900" >...</div>
{{end}}
</td>
<td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
<div class="text-gray-900" x-text="beneficiary.data.phone_number"></div>
</td>
<td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500"
x-text="beneficiary.data.email">
{{if (index $.ViewState.groups .ID).Data.arrive}}
<div class="text-gray-900" >{{(index $.ViewState.groups .ID).Data.arrive.properties.label}}</div>
{{else}}
<div class="text-gray-900" >...</div>
{{end}}
</td>
<td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
<template x-for="tag in beneficiary.data.tags">
<span
class="inline-flex rounded-full bg-green-100 px-2 text-xs font-semibold leading-5 text-green-800"
x-text="tag"></span>
</template>
</td>
<td
class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
<a :href="'/app/beneficiaries/' + beneficiary.id"
class="text-co-blue hover:text-co-blue">Voir<span class="sr-only">, <span
x-text="beneficiary.data.first_name"></span> <span
x-text="beneficiary.data.last_name"></span></a>
<a :href="'/app/journeys/groups_covoiturage/create/{{(index $.ViewState.groups .ID).ID}}/{{(index $.ViewState.groups .ID).Groupid}}/{{(index $.ViewState.groups .ID).Memberid}}'">
<div class="flex items-center">
<div class="ml-4">
<div class="text-co-blue hover:text-co-blue"><span
>retirer</span> </div>
</div>
</a>
</td>
</tr>
</template>
</tbody>
</table>
<div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
<div class="flex-1 flex justify-between sm:hidden">
<a href="#" class="relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
@click="paginate(current)"> Previous </a>
<a href="#" class="ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
@click="paginate(current+2)"> Next </a>
</div>
<div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
<div>
<p class="text-sm text-gray-700">
Résultats
<span class="font-medium" x-text="Math.min((current * 10)+1, state.count)"></span>
à
<span class="font-medium" x-text="Math.min((current * 10)+10, state.count)"></span>
sur
<span class="font-medium" x-text="state.count"></span>
</p>
</div>
<div>
<nav class="relative z-0 inline-flex rounded-md shadow-sm -space-x-px" aria-label="Pagination">
<a href="#" class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
@click="paginate(current)">
<span class="sr-only">Previous</span>
<!-- Heroicon name: solid/chevron-left -->
<svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
<path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
</svg>
</a>
<template x-for="i in nb_pages">
<a href="#" @click="paginate(i)"
class="relative inline-flex items-center px-4 py-2 border text-sm font-medium"
:class="i == current+1 ? 'z-10 bg-indigo-50 border-co-blue text-co-blue' : 'bg-white border-gray-300 text-gray-500 hover:bg-gray-50'"
x-text="i"></a>
</template>
<!-- Current: "z-10 bg-indigo-50 border-indigo-500 text-indigo-600", Default: "bg-white border-gray-300 text-gray-500 hover:bg-gray-50" -->
<a href="#" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
@click="paginate(current+2)">
<span class="sr-only">Next</span>
<!-- Heroicon name: solid/chevron-right -->
<svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
<path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
</svg>
</a>
</nav>
</div>
</div>
{{end}}
{{end}}
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- -->
</div>
</div>

View File

@ -62,16 +62,7 @@
</div>
<div class="ml-4">
<!-- <div class="font-medium text-gray-900"> <span
x-text="beneficiary.data.name"></span> </div> -->
<!-- <div class="flex items-center font-medium text-gray-700 text-xl">
{{$.IconSet.Icon "hero:outline/user-group" "flex-shrink-0 mr-1.5 h-5 w-5"}}
<p>
<span
x-text="beneficiary.data.name"></span>
</p>
</div> -->
<div class="truncate">
<div class="flex text-sm">
<p class="font-medium text-lg text-co-blue truncate" x-text="beneficiary.data.name"></p>
@ -99,7 +90,6 @@
</tr>
</template>
<!-- More people... -->
</tbody>
</table>
<div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">

View File

@ -0,0 +1,32 @@
{{define "content"}}
<div>
<form method="POST">
<div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
<div class="fixed inset-0 z-10 overflow-y-auto">
<div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
<div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full max-w-lg sm:p-6">
<div>
<div class="mx-auto flex h-12 w-12 items-center justify-center rounded-co bg-co-blue text-white">
{{.IconSet.Icon "hero:outline/information-circle" "h-6 w-6"}}
</div>
<div class="mt-3 text-center sm:mt-5">
<h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Confirmation de retrait</h3>
<div class="mt-2">
<p class="text-sm text-gray-500">Vous etes sur de retirer ce passager </p>
</div>
</div>
</div>
<div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
<a href="/app/journeys/groups_covoiturage/create/{{.ViewState.groupid}}" class="mt-3 inline-flex w-full justify-center rounded-l-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">Annuler</a>
<button type="submit" class="inline-flex w-full justify-center rounded-r-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-2 sm:text-sm">Confirmation</button>
</div>
</div>
</div>
</div>
</form>
</div>
{{end}}