diff --git a/config.yaml b/config.yaml index c6d6582..0bf1939 100644 --- a/config.yaml +++ b/config.yaml @@ -220,6 +220,7 @@ views: ko: files: - web/layouts/auth/onboarding-ko.html + icons: svg: coopgo:parcoursmob/monogram: diff --git a/emails/layout.html b/emails/layout.html old mode 100644 new mode 100755 diff --git a/web/layouts/administration/bookings_stats.html b/web/layouts/administration/bookings_stats.html index 30c5edf..3858bed 100644 --- a/web/layouts/administration/bookings_stats.html +++ b/web/layouts/administration/bookings_stats.html @@ -8,7 +8,7 @@
- +
- - -
- {{template "subscribers_table" .}} + + + {{template "subscribers_table" .}} {{end}} diff --git a/web/layouts/beneficiaries/_partials/beneficiary-events.html b/web/layouts/beneficiaries/_partials/beneficiary-events.html index 684622f..0b1562a 100644 --- a/web/layouts/beneficiaries/_partials/beneficiary-events.html +++ b/web/layouts/beneficiaries/_partials/beneficiary-events.html @@ -1,4 +1,63 @@ {{define "beneficiary_events"}} -
+{{ $calendarIcon := .IconSet.Icon "hero:outline/calendar" "h-6 w-6" }} +{{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}} +
+
+

Actions réalisées

+
+
{{end}} \ No newline at end of file diff --git a/web/layouts/beneficiaries/display.html b/web/layouts/beneficiaries/display.html index 40dbc4b..3be8ddf 100644 --- a/web/layouts/beneficiaries/display.html +++ b/web/layouts/beneficiaries/display.html @@ -151,10 +151,7 @@
-
-

Actions réalisées

-

Aucune action réalisée pour le moment

-
+ {{template "beneficiary_events" .}}
diff --git a/web/layouts/beneficiaries/update.html b/web/layouts/beneficiaries/update.html index 5b6db41..b30a7e8 100644 --- a/web/layouts/beneficiaries/update.html +++ b/web/layouts/beneficiaries/update.html @@ -162,13 +162,14 @@
- {{ $fieldName := "address" }} - {{if .ViewState.Data.address}} - {{$default := .ViewState.Data.address}} - {{ template "address" dict "FieldName" $fieldName "Default" $default}} - {{else}} - {{ template "address_autocomplete" dict "FieldName" $fieldName}} - {{end}} + {{ $fieldName := "address" }} + {{if .ViewState.Data.address}} + {{$default := .ViewState.Data.address}} + {{ template "address" dict "FieldName" $fieldName "Default" $default}} + {{else}} + {{ template "address_autocomplete" dict "FieldName" $fieldName}} + {{end}} +
diff --git a/web/layouts/vehicles/bookings-list.html b/web/layouts/vehicles/bookings-list.html index 4106abb..d6f9538 100644 --- a/web/layouts/vehicles/bookings-list.html +++ b/web/layouts/vehicles/bookings-list.html @@ -54,7 +54,7 @@ {{range .ViewState.bookings}} - + {{if .Data.administrator_unavailability}} Retiré @@ -76,15 +76,11 @@ {{end}} {{end}} - {{if not .bookings}} - - Disponible - - {{end}}
{{(index $.ViewState.vehicles_map .Vehicleid).Type}}
- + +
{{(index $.ViewState.vehicles_map .Vehicleid).Data.licence_plate}}
diff --git a/web/layouts/vehicles/search.html b/web/layouts/vehicles/search.html index 57b8446..42c2875 100644 --- a/web/layouts/vehicles/search.html +++ b/web/layouts/vehicles/search.html @@ -223,13 +223,11 @@ {{end}} -
- +
+
-
+
diff --git a/web/layouts/vehicles_management/booking-display.html b/web/layouts/vehicles_management/booking-display.html index e2e2f63..b12b2b6 100644 --- a/web/layouts/vehicles_management/booking-display.html +++ b/web/layouts/vehicles_management/booking-display.html @@ -23,6 +23,8 @@ {{end}} + +
@@ -106,10 +104,6 @@ Retiré - {{else if .Data.Deleted}} - - Annulé - {{else}} {{if eq .Status 1 }} @@ -171,19 +165,13 @@

Aucune réservation à venir

{{end}}
    - {{$noReservation := true}} {{range .ViewState.vehicle.Bookings}}
  • - {{if eq .Status 1 }}

    Du {{(timeFrom .Startdate).Format "02/01/2006"}} au {{(timeFrom .Enddate).Format "02/01/2006"}}

    - {{else if $noReservation}} - {{$noReservation = false}} -

    Aucune réservation à venir

    - {{end}}
  • {{end}} diff --git a/web/layouts/vehicles_management/fleet-update.html b/web/layouts/vehicles_management/fleet-update.html index b52cdba..665a721 100644 --- a/web/layouts/vehicles_management/fleet-update.html +++ b/web/layouts/vehicles_management/fleet-update.html @@ -1,28 +1,24 @@ {{define "content"}} -{{ if eq (index .ViewState.vehicle.Administrators 0) .Group.ID }}
    -

    Modifier le véhicule

    +

    Modifier un véhicule

    @@ -55,44 +47,19 @@
    - +
    - - -
    - Automatique -
    -
    - {{if .ViewState.vehicle.Data.automatic}} - - {{else}} - - {{end}} -
    -
    - -

    Ce véhicule a une boite automatique.

    -
    -
    -
    + {{template "vehicle_type_select" .}}
    -
    + class="block text-sm font-medium text-gray-700">Immatriculation Informations pratiques pour la réservation

    - {{ $fieldName := "address" }} - {{if .ViewState.vehicle.Data.address}} - {{$default := .ViewState.vehicle.Data.address}} + {{ $fieldName := "address" }} + {{if .ViewState.Data.address}} + {{$default := .ViewState.Data.address}} {{ template "address" dict "FieldName" $fieldName "Default" $default}} {{else}} {{ template "address_autocomplete" dict "FieldName" $fieldName}} {{end}} +
    - +
    - +
    @@ -140,28 +108,4 @@
    -{{else}} -
    - -
    -
    - -
    -
    -
    - {{.IconSet.Icon "hero:outline/information-circle" "h-6 w-6"}} -
    -
    - -
    -
    -
    - - Annuler - -
    -
    -
    -
    -{{end}} {{end}} \ No newline at end of file diff --git a/web/tailwind.config.js b/web/tailwind.config.js old mode 100644 new mode 100755