coopgo-apps
/
parcoursmob-default-theme
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add geographies filters

This commit is contained in:
Arnaud Delcasse 2025-10-14 16:32:01 +02:00
parent 62a3095f91
commit ee0bcd01b7
12 changed files with 218 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/layouts/dashboard/_partials/drivers-map-widget.html
View File

@ -5,6 +5,22 @@
<h3 class="text-lg leading-6 font-medium text-gray-900">
Carte des conducteurs
</h3>
{{if .geography_filters_enabled}}
<form>
<div class="grid grid-cols-1">
<select id="driver_address_geo" name="driver_address_geo" class="col-start-1 row-start-1 w-48 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
<option value="">Toutes les zones</option>
{{range .geography_filters_list}}
{{$geoValue := printf "%s:%s" .layer .code}}
<option value="{{$geoValue}}"{{if eq $.filters.driver_address_geo $geoValue}} selected{{end}}>{{.name}}</option>
{{end}}
</select>
<svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
<path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
</svg>
</div>
</form>
{{end}}
</div>
<div id="drivers-map" class="w-full rounded-lg overflow-hidden border border-gray-200" style="height: 500px;"></div>

59
web/layouts/organized_carpool/_partials/booking_filters.html
View File

@ -5,9 +5,9 @@
<input type="hidden" name="tab" value="{{$tab}}" />
<div class="flex flex-row justify-end flex-wrap">
<div class="flex flex-row justify-end items-end">
<div class="m-4">
<div class="m-2">
<div>
<label for="{{$tab}}_date_start" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Dates (début / fin)</label>
<div class="mt-2 flex">
@ -17,10 +17,10 @@
</div>
</div>
<div class="m-4">
<div class="m-2">
<label for="{{$tab}}_status" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Statut</label>
<div class="mt-2 grid grid-cols-1">
<select id="{{$tab}}_status" name="status" class="col-start-1 row-start-1 w-full appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
<select id="{{$tab}}_status" name="status" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
<option></option>
<option value="WAITING_DRIVER_CONFIRMATION"{{if eq .filters.status "WAITING_DRIVER_CONFIRMATION"}} selected{{end}}>Attente confirmation conducteur</option>
<option value="CONFIRMED"{{if eq .filters.status "CONFIRMED"}} selected{{end}}>Confirmé</option>
@ -32,10 +32,55 @@
</div>
</div>
<div class="m-4">
{{if $.geography_filters_enabled}}
<div class="m-2">
<label for="{{$tab}}_passenger_address_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Adresse passager</label>
<div class="mt-2 grid grid-cols-1">
<select id="{{$tab}}_passenger_address_geo" name="passenger_address_geo" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
<option value="">Toutes les zones</option>
{{range $.geography_filters_list}}
{{$geoValue := printf "%s:%s" .layer .code}}
<option value="{{$geoValue}}"{{if eq $.filters.passenger_address_geo $geoValue}} selected{{end}}>{{.name}}</option>
{{end}}
</select>
<svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
<path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
</svg>
</div>
</div>
<div class="m-2">
<label for="{{$tab}}_departure_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Départ</label>
<div class="mt-2 grid grid-cols-1">
<select id="{{$tab}}_departure_geo" name="departure_geo" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
<option value="">Toutes les zones</option>
{{range $.geography_filters_list}}
{{$geoValue := printf "%s:%s" .layer .code}}
<option value="{{$geoValue}}"{{if eq $.filters.departure_geo $geoValue}} selected{{end}}>{{.name}}</option>
{{end}}
</select>
<svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
<path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
</svg>
</div>
</div>
<div class="m-2">
<label for="{{$tab}}_destination_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Destination</label>
<div class="mt-2 grid grid-cols-1">
<select id="{{$tab}}_destination_geo" name="destination_geo" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
<option value="">Toutes les zones</option>
{{range $.geography_filters_list}}
{{$geoValue := printf "%s:%s" .layer .code}}
<option value="{{$geoValue}}"{{if eq $.filters.destination_geo $geoValue}} selected{{end}}>{{.name}}</option>
{{end}}
</select>
<svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
<path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
</svg>
</div>
</div>
{{end}}
</div>

2
web/layouts/organized_carpool/_partials/bookings_history.html
View File

@ -1,6 +1,6 @@
{{ define "carpool_bookings_history" }}
{{template "booking_filters" dict "tab" "carpoolHistory" "filters" .ViewState.hist_filters }}
{{template "booking_filters" dict "tab" "carpoolHistory" "filters" .ViewState.hist_filters "geography_filters_enabled" .ViewState.geography_filters_enabled "geography_filters_list" .ViewState.geography_filters_list }}
{{if eq (len .ViewState.bookings_history) 0}}
<div class="m-10 text-center text-gray-600">Aucun trajet dans le passé</div>
{{else}}

2
web/layouts/organized_carpool/_partials/bookings_list.html
View File

@ -1,6 +1,6 @@
{{ define "carpool_bookings_list" }}
{{template "booking_filters" dict "tab" "carpoolService" "filters" .ViewState.filters }}
{{template "booking_filters" dict "tab" "carpoolService" "filters" .ViewState.filters "geography_filters_enabled" .ViewState.geography_filters_enabled "geography_filters_list" .ViewState.geography_filters_list }}
{{if eq (len .ViewState.bookings) 0}}
<div class="m-10 text-center text-gray-600">Aucun trajet déclaré</div>
{{else}}

45
web/layouts/organized_carpool/_partials/drivers_list.html
View File

@ -1,24 +1,59 @@
{{ define "carpool_drivers_list" }}
<div class="sm:flex sm:items-center">
<div class="sm:flex sm:items-center sm:justify-between">
{{if $.ViewState.geography_filters_enabled}}
<form class="flex flex-row items-end m-4">
<input type="hidden" name="tab" value="drivers" />
{{if $.ViewState.archived}}<input type="hidden" name="archived" value="true" />{{end}}
<div>
<label for="drivers_driver_address_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Adresse conducteur</label>
<div class="mt-2 grid grid-cols-1">
<select id="drivers_driver_address_geo" name="driver_address_geo" class="col-start-1 row-start-1 w-48 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
<option value="">Toutes les zones</option>
{{range $.ViewState.geography_filters_list}}
{{$geoValue := printf "%s:%s" .layer .code}}
<option value="{{$geoValue}}"{{if eq $.ViewState.filters.driver_address_geo $geoValue}} selected{{end}}>{{.name}}</option>
{{end}}
</select>
<svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
<path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
</svg>
</div>
</div>
</form>
{{else}}
<div class="sm:flex-auto">
<p class="mt-2 text-sm text-gray-700"></p>
</div>
<div class="m-4 sm:ml-16 sm:flex-none">
<!--<a href="/api/cache/{{.ViewState.CacheId}}/export">
{{end}}
<div class="m-4 sm:flex-none">
<a href="/exports/organized-carpool/drivers.xlsx?{{if $.ViewState.archived}}archived=true&{{end}}{{if $.ViewState.filters.driver_address_geo}}driver_address_geo={{$.ViewState.filters.driver_address_geo}}{{end}}">
<button type="button"
class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
{{$.IconSet.Icon "hero:outline/document-arrow-down" "h-5 w-5 mr-3"}}
Exporter
</button>
</a>-->
<a href="/app/organized-carpool/?archived=true">
</a>
{{if .ViewState.archived}}
<a href="/app/organized-carpool/?tab=drivers">
<button type="button"
class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
{{$.IconSet.Icon "hero:outline/archive-box-x-mark" "h-5 w-5 mr-3"}}
Covoitureurs actifs
</button>
</a>
{{else}}
<a href="/app/organized-carpool/?tab=drivers&archived=true">
<button type="button"
class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
{{$.IconSet.Icon "hero:outline/archive-box" "h-5 w-5 mr-3"}}
Covoitureurs archivés
</button>
</a>
{{end}}
<a href="/app/organized-carpool/drivers/create">
<button type="button"
class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">

5
web/layouts/organized_carpool/overview.html
View File

@ -35,7 +35,10 @@
{{$hasParams := false}}
{{if .ViewState.hist_filters.date_start}}{{$exportURL = printf "%s?start_date=%s" $exportURL .ViewState.hist_filters.date_start}}{{$hasParams = true}}{{end}}
{{if .ViewState.hist_filters.date_end}}{{if $hasParams}}{{$exportURL = printf "%s&end_date=%s" $exportURL .ViewState.hist_filters.date_end}}{{else}}{{$exportURL = printf "%s?end_date=%s" $exportURL .ViewState.hist_filters.date_end}}{{$hasParams = true}}{{end}}{{end}}
{{if .ViewState.hist_filters.status}}{{if $hasParams}}{{$exportURL = printf "%s&status=%s" $exportURL .ViewState.hist_filters.status}}{{else}}{{$exportURL = printf "%s?status=%s" $exportURL .ViewState.hist_filters.status}}{{end}}{{end}}
{{if .ViewState.hist_filters.status}}{{if $hasParams}}{{$exportURL = printf "%s&status=%s" $exportURL .ViewState.hist_filters.status}}{{else}}{{$exportURL = printf "%s?status=%s" $exportURL .ViewState.hist_filters.status}}{{$hasParams = true}}{{end}}{{end}}
{{if .ViewState.hist_filters.departure_geo}}{{if $hasParams}}{{$exportURL = printf "%s&departure_geo=%s" $exportURL .ViewState.hist_filters.departure_geo}}{{else}}{{$exportURL = printf "%s?departure_geo=%s" $exportURL .ViewState.hist_filters.departure_geo}}{{$hasParams = true}}{{end}}{{end}}
{{if .ViewState.hist_filters.destination_geo}}{{if $hasParams}}{{$exportURL = printf "%s&destination_geo=%s" $exportURL .ViewState.hist_filters.destination_geo}}{{else}}{{$exportURL = printf "%s?destination_geo=%s" $exportURL .ViewState.hist_filters.destination_geo}}{{$hasParams = true}}{{end}}{{end}}
{{if .ViewState.hist_filters.passenger_address_geo}}{{if $hasParams}}{{$exportURL = printf "%s&passenger_address_geo=%s" $exportURL .ViewState.hist_filters.passenger_address_geo}}{{else}}{{$exportURL = printf "%s?passenger_address_geo=%s" $exportURL .ViewState.hist_filters.passenger_address_geo}}{{$hasParams = true}}{{end}}{{end}}
<a href="{{$exportURL}}">
<button type="button"

61
web/layouts/solidarity_transport/_partials/booking_filters.html
View File

@ -5,9 +5,9 @@
<input type="hidden" name="tab" value="{{$tab}}" />
<div class="flex flex-row justify-end flex-wrap">
<div class="flex flex-row justify-end items-end">
<div class="m-4">
<div class="m-2">
<div>
<label for="{{$tab}}_date_start" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Dates (début / fin)</label>
<div class="mt-2 flex">
@ -17,10 +17,10 @@
</div>
</div>
<div class="m-4">
<div class="m-2">
<label for="{{$tab}}_status" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Statut</label>
<div class="mt-2 grid grid-cols-1">
<select id="{{$tab}}_status" name="status" class="col-start-1 row-start-1 w-full appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
<select id="{{$tab}}_status" name="status" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
<option></option>
<option value="VALIDATED"{{if eq .filters.status "VALIDATED"}} selected{{end}}>Validé</option>
<option value="CANCELLED"{{if eq .filters.status "CANCELLED"}} selected{{end}}>Annulé</option>
@ -33,9 +33,58 @@
</div>
<div class="m-4">
{{if $.geography_filters_enabled}}
<div class="m-2">
<label for="{{$tab}}_passenger_address_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Adresse passager</label>
<div class="mt-2 grid grid-cols-1">
<select id="{{$tab}}_passenger_address_geo" name="passenger_address_geo" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
<option value="">Toutes les zones</option>
{{range $.geography_filters_list}}
{{$geoValue := printf "%s:%s" .layer .code}}
<option value="{{$geoValue}}"{{if eq $.filters.passenger_address_geo $geoValue}} selected{{end}}>{{.name}}</option>
{{end}}
</select>
<svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
<path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
</svg>
</div>
</div>
{{end}}
{{if $.geography_filters_enabled}}
<div class="m-2">
<label for="{{$tab}}_departure_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Départ</label>
<div class="mt-2 grid grid-cols-1">
<select id="{{$tab}}_departure_geo" name="departure_geo" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
<option value="">Toutes les zones</option>
{{range $.geography_filters_list}}
{{$geoValue := printf "%s:%s" .layer .code}}
<option value="{{$geoValue}}"{{if eq $.filters.departure_geo $geoValue}} selected{{end}}>{{.name}}</option>
{{end}}
</select>
<svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
<path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
</svg>
</div>
</div>
<div class="m-2">
<label for="{{$tab}}_destination_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Destination</label>
<div class="mt-2 grid grid-cols-1">
<select id="{{$tab}}_destination_geo" name="destination_geo" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
<option value="">Toutes les zones</option>
{{range $.geography_filters_list}}
{{$geoValue := printf "%s:%s" .layer .code}}
<option value="{{$geoValue}}"{{if eq $.filters.destination_geo $geoValue}} selected{{end}}>{{.name}}</option>
{{end}}
</select>
<svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
<path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
</svg>
</div>
</div>
{{end}}
</div>

2
web/layouts/solidarity_transport/_partials/bookings_history.html
View File

@ -1,6 +1,6 @@
{{ define "solidarity_bookings_history" }}
{{template "booking_filters" dict "tab" "solidarityHistory" "filters" .ViewState.hist_filters }}
{{template "booking_filters" dict "tab" "solidarityHistory" "filters" .ViewState.hist_filters "geography_filters_enabled" .ViewState.geography_filters_enabled "geography_filters_list" .ViewState.geography_filters_list }}
{{if eq (len .ViewState.bookings_history) 0}}
<div class="m-10 text-center text-gray-600">Aucun trajet dans le passé</div>
{{else}}

2
web/layouts/solidarity_transport/_partials/bookings_list.html
View File

@ -1,6 +1,6 @@
{{ define "solidarity_bookings_list" }}
{{template "booking_filters" dict "tab" "solidarityService" "filters" .ViewState.filters }}
{{template "booking_filters" dict "tab" "solidarityService" "filters" .ViewState.filters "geography_filters_enabled" .ViewState.geography_filters_enabled "geography_filters_list" .ViewState.geography_filters_list }}
{{if eq (len .ViewState.bookings) 0}}
<div class="m-10 text-center text-gray-600">Aucun trajet déclaré</div>

45
web/layouts/solidarity_transport/_partials/drivers_list.html
View File

@ -1,23 +1,58 @@
{{ define "solidarity_drivers_list" }}
<div class="sm:flex sm:items-center">
<div class="sm:flex sm:items-center sm:justify-between">
{{if $.ViewState.geography_filters_enabled}}
<form class="flex flex-row items-end m-4">
<input type="hidden" name="tab" value="drivers" />
{{if $.ViewState.archived}}<input type="hidden" name="archived" value="true" />{{end}}
<div>
<label for="drivers_driver_address_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Adresse conducteur</label>
<div class="mt-2 grid grid-cols-1">
<select id="drivers_driver_address_geo" name="driver_address_geo" class="col-start-1 row-start-1 w-48 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
<option value="">Toutes les zones</option>
{{range $.ViewState.geography_filters_list}}
{{$geoValue := printf "%s:%s" .layer .code}}
<option value="{{$geoValue}}"{{if eq $.ViewState.filters.driver_address_geo $geoValue}} selected{{end}}>{{.name}}</option>
{{end}}
</select>
<svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
<path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
</svg>
</div>
</div>
</form>
{{else}}
<div class="sm:flex-auto">
<p class="mt-2 text-sm text-gray-700"></p>
</div>
<div class="m-4 sm:ml-16 sm:flex-none">
<!--<a href="/api/cache/{{.ViewState.CacheId}}/export">
{{end}}
<div class="m-4 sm:flex-none">
<a href="/exports/solidarity-transport/drivers.xlsx?{{if $.ViewState.archived}}archived=true&{{end}}{{if $.ViewState.filters.driver_address_geo}}driver_address_geo={{$.ViewState.filters.driver_address_geo}}{{end}}">
<button type="button"
class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
{{$.IconSet.Icon "hero:outline/document-arrow-down" "h-5 w-5 mr-3"}}
Exporter
</button>
</a>-->
<a href="/app/solidarity-transport/?archived=true">
</a>
{{if .ViewState.archived}}
<a href="/app/solidarity-transport/?tab=drivers">
<button type="button"
class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
{{$.IconSet.Icon "hero:outline/archive-box-x-mark" "h-5 w-5 mr-3"}}
Conducteurs actifs
</button>
</a>
{{else}}
<a href="/app/solidarity-transport/?tab=drivers&archived=true">
<button type="button"
class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
{{$.IconSet.Icon "hero:outline/archive-box" "h-5 w-5 mr-3"}}
Conducteurs archivés
</button>
</a>
{{end}}
<a href="/app/solidarity-transport/drivers/create">
<button type="button"
class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">

5
web/layouts/solidarity_transport/overview.html
View File

@ -40,7 +40,10 @@
{{$hasParams := false}}
{{if .ViewState.hist_filters.date_start}}{{$exportURL = printf "%s?start_date=%s" $exportURL .ViewState.hist_filters.date_start}}{{$hasParams = true}}{{end}}
{{if .ViewState.hist_filters.date_end}}{{if $hasParams}}{{$exportURL = printf "%s&end_date=%s" $exportURL .ViewState.hist_filters.date_end}}{{else}}{{$exportURL = printf "%s?end_date=%s" $exportURL .ViewState.hist_filters.date_end}}{{$hasParams = true}}{{end}}{{end}}
{{if .ViewState.hist_filters.status}}{{if $hasParams}}{{$exportURL = printf "%s&status=%s" $exportURL .ViewState.hist_filters.status}}{{else}}{{$exportURL = printf "%s?status=%s" $exportURL .ViewState.hist_filters.status}}{{end}}{{end}}
{{if .ViewState.hist_filters.status}}{{if $hasParams}}{{$exportURL = printf "%s&status=%s" $exportURL .ViewState.hist_filters.status}}{{else}}{{$exportURL = printf "%s?status=%s" $exportURL .ViewState.hist_filters.status}}{{$hasParams = true}}{{end}}{{end}}
{{if .ViewState.hist_filters.departure_geo}}{{if $hasParams}}{{$exportURL = printf "%s&departure_geo=%s" $exportURL .ViewState.hist_filters.departure_geo}}{{else}}{{$exportURL = printf "%s?departure_geo=%s" $exportURL .ViewState.hist_filters.departure_geo}}{{$hasParams = true}}{{end}}{{end}}
{{if .ViewState.hist_filters.destination_geo}}{{if $hasParams}}{{$exportURL = printf "%s&destination_geo=%s" $exportURL .ViewState.hist_filters.destination_geo}}{{else}}{{$exportURL = printf "%s?destination_geo=%s" $exportURL .ViewState.hist_filters.destination_geo}}{{$hasParams = true}}{{end}}{{end}}
{{if .ViewState.hist_filters.passenger_address_geo}}{{if $hasParams}}{{$exportURL = printf "%s&passenger_address_geo=%s" $exportURL .ViewState.hist_filters.passenger_address_geo}}{{else}}{{$exportURL = printf "%s?passenger_address_geo=%s" $exportURL .ViewState.hist_filters.passenger_address_geo}}{{$hasParams = true}}{{end}}{{end}}
<a href="{{$exportURL}}">
<button type="button"

3
web/public/css/main.css
View File

@ -851,6 +851,9 @@
.w-32 {
width: calc(var(--spacing) * 32);
}
.w-36 {
width: calc(var(--spacing) * 36);
}
.w-40 {
width: calc(var(--spacing) * 40);
}