30 Commits

Author SHA1 Message Date
8cf9fcdb0a [+] add modification theme 2023-11-27 10:39:53 +01:00
d6b8a48d1c [+] theme 2023-11-27 10:30:47 +01:00
soukainna
cbc77f1615 Merge branch 'fixMultipleReservationV' into dev 2023-06-22 14:24:17 +02:00
soukainna
fc8b325865 merge branch FixAddressBeneficiary into dev 2023-06-22 12:29:54 +02:00
89adcc69a2 Merge branch 'dev' of https://git.coopgo.io/coopgo-apps/parcoursmob-default-theme into dev 2023-06-02 14:59:24 +02:00
da3c37699e edit template vehicle_stats and booking-list to add export button 2023-06-02 14:57:18 +02:00
019569155a add export agenda by Salim 2023-06-01 14:11:30 +02:00
soukainna
bd71a36cd3 fix duplicate group 2023-05-19 11:23:18 +02:00
soukainna
8778f88fbd fix the type of vehicle 2023-05-19 11:16:00 +02:00
soukainna
3aba9e0071 fix the group settings 2023-05-19 11:16:00 +02:00
soukainna
560af60f32 allow modification for owners 2023-05-19 11:16:00 +02:00
soukainna
4789c5a49e allow modify option just for owners 2023-05-19 11:16:00 +02:00
soukainna
b480747b86 add the update file 2023-05-19 11:16:00 +02:00
soukainna
5617646bdb add the update file 2023-05-19 11:16:00 +02:00
soukainna
4c05d570f7 add modify button 2023-05-19 11:16:00 +02:00
soukainna
11e377ddb3 fix config file 2023-05-19 11:16:00 +02:00
18e2517805 edit template fleet-display and delete-booking template 2023-05-17 12:50:59 +02:00
bad991c3bc edit bookings-list, booking-display and delete-booking template 2023-05-12 11:06:55 +02:00
cf7b78e64e add icone 'Annulé' and update 'Réservations à venir' on fleet-display template 2023-05-10 12:04:17 +02:00
soukainna
eec5afdf39 fix the modify address 2023-05-09 12:13:14 +02:00
soukainna
83ae4665f0 fix the group settings 2023-05-05 10:42:55 +02:00
soukainna
5950599bdb allow modification for owners 2023-05-05 10:22:42 +02:00
soukainna
e5dae2d18f allow modify option just for owners 2023-05-05 10:22:08 +02:00
soukainna
e5fc2bcfb5 add the update file 2023-05-05 09:18:57 +02:00
soukainna
6c5c25a992 add the update file 2023-05-05 09:18:28 +02:00
soukainna
89af48389a add modify button 2023-05-05 09:15:32 +02:00
soukainna
669d7e4e7b fix config file 2023-05-05 09:13:04 +02:00
soukainna
0bf315596b add hidden button to block multiple reservation 2023-05-03 16:51:01 +02:00
61e9285a2b edit config.yaml to add delete_booking route 2023-05-03 14:30:15 +02:00
eb8859ca67 add button Annuler in booking-display and create delete-booking 2023-05-03 14:15:44 +02:00
6 changed files with 103 additions and 12 deletions

0
emails/layout.html Normal file → Executable file
View File

View File

@@ -1,4 +1,63 @@
{{define "beneficiary_events"}}
<div class="px-4 py-6 sm:px-6">
{{ $calendarIcon := .IconSet.Icon "hero:outline/calendar" "h-6 w-6" }}
{{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}}
<div class="bg-white shadow sm:rounded-lg">
<div class="px-4 py-5 sm:px-6">
<h2 id="timeline-title" class="text-lg font-medium text-gray-900">Actions réalisées</h2>
</div>
<div class="border-t border-gray-200">
{{ $eventCount := len .ViewState.event }}
<ul role="list" class="divide-y divide-gray-200 flex-1">
{{if eq $eventCount 0}}
<li class="py-2 px-4">
<p class="py-5 mt-1 max-w-2xl text-sm text-gray-500">Aucun dispositif n'est prévu pour le moment.</p>
</li>
{{else}}
{{range .ViewState.event}}
{{if eq .Deleted false}}
<li class="py-5 px-4 flex">
<a href="{{.Db}}{{.ID}}" class="flex w-full">
<div class="flex-1 ml-3">
<div class="flex items-center">
{{if eq .Status 2}}
{{if eq .Icons "vehicle"}}
<span class="bg-co-green text-white rounded-full h-8 w-10 flex items-center justify-center">{{$carIcon}}</span>
{{else}}
<span class="bg-co-green text-white rounded-full h-8 w-10 flex items-center justify-center">{{$calendarIcon}}</span>
{{end}}
{{end}}
{{if eq .Status 1}}
{{if eq .Icons "vehicle"}}
<span class="bg-co-blue text-white rounded-full h-8 w-10 flex items-center justify-center">{{$carIcon}}</span>
{{else}}
<span class="bg-co-blue text-white rounded-full h-8 w-10 flex items-center justify-center">{{$calendarIcon}}</span>
{{end}}
{{end}}
{{if eq .Status 3}}
{{if eq .Icons "vehicle"}}
<span class="bg-gray-500 text-white rounded-full h-8 w-10 flex items-center justify-center">{{$carIcon}}</span>
{{else}}
<span class="bg-gray-500 text-white rounded-full h-8 w-10 flex items-center justify-center">{{$calendarIcon}}</span>
{{end}}
{{end}}
{{if eq .Date .DateEnd}}
<p class="text-sm font-medium text-gray-500"> &ensp;le {{(timeFrom .Date).Format "02/01/2006"}}</p>
{{else}}
<p class="text-sm font-medium text-gray-500">&ensp;du {{(timeFrom .Date).Format "02/01/2006"}} au {{(timeFrom .DateEnd).Format "02/01/2006"}}</p>
{{end}}
</div>
<p class="mt-1 text-sm text-gray-900">{{.Type}} - {{.Name}}</p>
</div>
</a>
</li>
{{end}}
{{end}}
{{end}}
</ul>
</div>
</div>
{{end}}

View File

@@ -151,10 +151,7 @@
</div>
<section aria-labelledby="timeline-title" class="lg:col-start-3 lg:col-span-1">
<div class="bg-white px-4 py-5 shadow sm:rounded-lg sm:px-6">
<h2 id="timeline-title" class="text-lg font-medium text-gray-900">Actions réalisées</h2>
<p class="p-12 text-gray-500 text-center text-md">Aucune action réalisée pour le moment</p>
</div>
{{template "beneficiary_events" .}}
</section>
</div>
</main>

View File

@@ -54,7 +54,7 @@
{{range .ViewState.bookings}}
<tr>
<td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
<td class="flex-col py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
{{if .Data.administrator_unavailability}}
<span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
Retiré
@@ -76,15 +76,11 @@
</span>
{{end}}
{{end}}
{{if not .bookings}}
<span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
Disponible
</span>
{{end}}
</td>
<td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
<div class="text-gray-900" >{{(index $.ViewState.vehicles_map .Vehicleid).Type}}</div>
</td>
</td>
<td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
<div class="text-gray-900" >{{(index $.ViewState.vehicles_map .Vehicleid).Data.licence_plate}}</div>
</td>

View File

@@ -0,0 +1,39 @@
{{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 d'annulation</h3>
<div class="mt-2">
<p class="text-sm text-gray-500">Souhaitez-vous vraiment annuler cette réservaton ?</p>
</div>
<div class="col-span-6">
<label for="motif" class="block text-sm font-medium text-gray-700">Motif</label>
<div class="mt-1">
<textarea rows="4" name="motif" id="motif"
class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea>
</div>
</div>
</div>
</div>
<div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
<a href="/app/vehicles-management/bookings/{{.ViewState.booking.ID}}" 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}}

0
web/tailwind.config.js Normal file → Executable file
View File