Commit Graph

195 Commits

Author SHA1 Message Date
Nicolas CARON 153e832649 Add VehicleBookingsCreateDiag - second route to create a diag in reservation 2024-12-16 14:41:52 +01:00
Nicolas CARON ef66fa9876 Add BookingsCreateDiag 2024-12-16 12:38:28 +01:00
Nicolas CARON 34faa8c215 Add vehicles_managment/_partials/vehicle-diag.html & vehicles_management/create-diag.html 2024-12-10 16:10:58 +01:00
Nicolas CARON d9bb47bc98 Edit delete-diag.html - Redirect to the diag page 2024-12-09 14:17:01 +01:00
Nicolas CARON b9692a09f2 Add update-diag.html 2024-12-09 13:26:29 +01:00
Nicolas CARON ea6ed41608 Add display-diag.html 2024-12-04 18:20:56 +01:00
Nicolas CARON 676eea1238 Add module diags in menu & home page for diags 2024-12-04 17:29:10 +01:00
Nicolas CARON 395160db6e Edit beneficiary-diags and create-diag template on beneficiaries 2024-12-04 14:12:51 +01:00
Nicolas CARON bc948e0141 Add diags 2024-12-02 08:58:53 +01:00
Arnaud Delcasse 1d86d44aa8 Add beneficiaries information to bookings list 2024-11-19 15:55:12 +01:00
Arnaud Delcasse 03f389825e Merge branch 'dev' of https://git.coopgo.io/coopgo-apps/parcoursmob-default-theme into dev 2024-11-19 15:17:18 +01:00
Arnaud Delcasse fc0739ab57 Add Quilljs for rich text input instead of simple textereas 2024-11-19 15:16:57 +01:00
Nicolas CARON 9b76cb143d Update web/layouts/members/display.html 2024-11-18 13:41:48 +01:00
Nicolas CARON c6f40f2aa2 fix some error on web/layouts/vehicles_management/fleet-update.html 2024-10-29 14:07:08 +01:00
Nicolas CARON 3526ee8700 add bookings on dashboard & kilometers on vehicles management 2024-10-29 12:09:50 +01:00
Nicolas CARON d8369bad3d Edit web/layout/vehicles/search.html - Add Documents demandés 2024-10-28 14:38:00 +01:00
Nicolas CARON 1903cd27db edit web/layouts/agenda/create-event.html 2024-10-22 12:10:49 +02:00
Nicolas CARON 5eccdcf89b edit web/layouts/agenda/_partials/event-files.html & web/layouts/agenda/display-event.html 2024-10-15 10:52:23 +02:00
Nicolas CARON 56f0700999 edit web/layouts/agenda/_partials/event-files.html 2024-10-14 09:59:33 +02:00
Nicolas CARON c8ab3f22ef edit display-event.html & add event-files.html 2024-10-07 17:57:51 +02:00
Nicolas CARON 10c4fb22d1 edit display-event.html 2024-10-02 14:41:37 +02:00
Nicolas CARON 698ccfc9d6 edit display-event.html 2024-10-02 14:36:23 +02:00
Arnaud Delcasse 1f951da1fa Merge branch 'main' into spie06 2024-01-30 12:20:29 +01:00
Arnaud Delcasse 31f86b1782 Updates feedbacks Mobilis06 and FDN 2024-01-30 12:20:09 +01:00
Arnaud Delcasse 2747ce67fa Merge branch 'main' into spie06 2023-11-28 11:38:08 +01:00
Arnaud Delcasse 118ea26eb8 merge and fix 2023-11-28 11:37:51 +01:00
mfrigo 8cf9fcdb0a [+] add modification theme 2023-11-27 10:39:53 +01:00
Arnaud Delcasse 672fdb98fd Merge branch 'main' into spie06 2023-11-27 08:32:29 +01:00
Arnaud Delcasse 929385d5e0 merge and fix 2023-11-27 08:31:13 +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
Nicolas CARON 89adcc69a2 Merge branch 'dev' of https://git.coopgo.io/coopgo-apps/parcoursmob-default-theme into dev 2023-06-02 14:59:24 +02:00
Nicolas CARON da3c37699e edit template vehicle_stats and booking-list to add export button 2023-06-02 14:57:18 +02:00
Nicolas CARON 019569155a add export agenda by Salim 2023-06-01 14:11:30 +02:00
sbouaram db4c22699e agenda event export button 2023-05-30 09:09:53 +02:00
soukainna 8778f88fbd fix the type of vehicle 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
Nicolas CARON 18e2517805 edit template fleet-display and delete-booking template 2023-05-17 12:50:59 +02:00
Nicolas CARON bad991c3bc edit bookings-list, booking-display and delete-booking template 2023-05-12 11:06:55 +02:00
Nicolas CARON 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 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 0bf315596b add hidden button to block multiple reservation 2023-05-03 16:51:01 +02:00
Nicolas CARON 61e9285a2b edit config.yaml to add delete_booking route 2023-05-03 14:30:15 +02:00
Nicolas CARON eb8859ca67 add button Annuler in booking-display and create delete-booking 2023-05-03 14:15:44 +02:00
Arnaud Delcasse 03b9044ffc Merge branch 'main' into spie06 2023-04-12 22:21:43 +02:00
Arnaud Delcasse d6de19d8e2 Add exports 2023-04-12 22:21:25 +02:00
Arnaud Delcasse 0ecee50d1c Merge branch 'main' into spie06 2023-04-12 10:55:41 +02:00
Arnaud Delcasse 39e770bb09 Bookings list in admin 2023-04-12 10:52:29 +02:00
Arnaud Delcasse 96205b81df Merge branch 'main' into spie06 2023-03-15 16:48:27 +01:00
Arnaud Delcasse a11ed1c595 Fix document update issue 2023-03-15 16:48:09 +01:00
Arnaud Delcasse 2ea7cf99f6 Merge branch 'main' into spie06 2023-03-10 15:44:01 +01:00
Arnaud Delcasse 139b4c9c14 Add licence plate 2023-03-10 15:43:46 +01:00
Arnaud Delcasse 2056bc72e2 Merge branch 'main' into spie06 2023-03-10 14:52:58 +01:00
Arnaud Delcasse 072eb62d63 Remove Voitures disponibles 2023-03-10 14:52:30 +01:00
Arnaud Delcasse 388b6366df Merge branch 'main' into spie06 2023-03-10 13:20:22 +01:00
Arnaud Delcasse 0c77e5054a small updates after merge 2023-03-10 13:20:03 +01:00
Nicolas CARON b89b8064c5 edit vehicles-list to fix viewing status problems 2023-03-08 10:09:49 +01:00
soukainna 0f4d0e1e5b fix the break err 2023-03-06 10:49:24 +01:00
soukainna 583027422c Merge branch 'addStatistiques' into dev 2023-03-06 10:39:38 +01:00
soukainna a36827a6ff add vehicles status in stat 2023-03-06 10:22:25 +01:00
Nicolas CARON ad7f5b642e Sow status of vehicle in vehicles list 2023-03-03 16:58:47 +01:00
Nicolas CARON 193bd8ef3a add 'Retiré' in 'Statut Réservation' for some case 2023-03-03 13:16:26 +01:00
Nicolas CARON 332d9dd509 add 'Disponible' for 'Statut Réservation' for some case 2023-03-03 11:39:37 +01:00
soukainna 511baa6a8e modify config 2023-02-27 15:10:49 +01:00
soukainna 031ef7b924 put organisation info 2023-02-27 14:55:23 +01:00
soukainna fc60854e21 add members stats 2023-02-27 14:16:01 +01:00
soukainna afc403bded add vehicles stats 2023-02-27 14:15:02 +01:00
soukainna e0fd3aa510 fix events stats 2023-02-27 14:14:08 +01:00
soukainna 33c182574c add events stats 2023-02-27 14:10:26 +01:00
soukainna 274f6c1616 add beneficaires stats 2023-02-27 14:09:57 +01:00
soukainna 612f74202d remove sup button 2023-02-24 18:50:26 +01:00
soukainna 6ccb72e566 drop my comment 2023-02-24 18:49:13 +01:00
soukainna ea4eea03da delete some logs 2023-02-24 18:47:58 +01:00
Nicolas CARON bb70ed9136 edit design in template vehicles-list 2023-02-24 17:23:27 +01:00
Nicolas CARON c450eecc37 display all status for vehicles list - statut 'Disponible' for a new vehicle 2023-02-24 16:04:01 +01:00
Nicolas CARON 59950586ec showing 1 statut for vehicles-list 2023-02-24 13:51:25 +01:00
Nicolas CARON c16e27fb25 showing all statuts for vehicle 2023-02-24 10:53:27 +01:00
Nicolas CARON 361447f188 add 'statut' on vehicles-list template 2023-02-23 16:46:56 +01:00
Nicolas CARON 70ad96a4e8 add 'statut' on vehicles-list template 2023-02-23 16:46:38 +01:00
soukainna a2f9184e22 fix profile err 2023-02-23 09:52:02 +01:00
soukainna 3a58b63edd Merge branch 'addInfoInCovoiturage' into dev 2023-02-22 12:38:20 +01:00
soukainna 0867a13df7 Merge branch 'modifyAnEvent' into dev 2023-02-22 12:33:44 +01:00
soukainna 5ffb2bcf85 add file unbloking 2023-02-22 12:23:10 +01:00
soukainna 18f126e4eb create members list 2023-02-22 11:06:21 +01:00
soukainna 1c29f00720 add organisations 2023-02-22 11:05:54 +01:00
soukainna 70186d1357 add url to redirect sataistique page 2023-02-22 11:05:36 +01:00
soukainna 1a67ee50bb modify text 2023-02-17 17:24:45 +01:00
Nicolas CARON 494f1124fa edit template history-event 2023-02-17 15:28:07 +01:00
Nicolas CARON 77445af5fb edit delete button for different organization 2023-02-17 11:47:26 +01:00
Nicolas CARON 1189fef6c0 edit delete button for different organization 2023-02-17 11:45:58 +01:00
soukainna b7eb73a4bd fix some err 2023-02-17 10:53:57 +01:00