Commit Graph

88 Commits

Author SHA1 Message Date
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
Nicolas CARON 46f1d44b11 add delete button for different organization 2023-02-17 10:24:30 +01:00
Nicolas CARON 09b0458f62 edit display-event and history-event template 2023-02-16 09:05:36 +01:00
Nicolas CARON 41c1e10924 edit template 'history-event' 2023-02-15 14:26:56 +01:00
soukainna 39d4713ebf add the member page and not the beneficaire page 2023-02-15 11:32:27 +01:00
soukainna b004cf847a make the subscriber_by clickable 2023-02-13 10:29:50 +01:00
Nicolas CARON 3dce51620f add 'History' page 2023-02-08 09:36:48 +01:00
soukainna 759e8f810a add condition to display modify button 2023-02-03 16:12:47 +01:00