1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-12 23:09:03 +01:00
Commit Graph

274 Commits

Author SHA1 Message Date
Du Peng
0803eb0833 (bug) pre-registration event reservations ilimit places 2023-10-26 14:35:18 +02:00
Vincent
1290874811 (ui) update the layout of detailed views + image format tooltip 2023-10-12 17:09:38 +02:00
Du Peng
84a9e42161 Merge branch 'family_compte_pre_inscription' into dev 2023-09-25 12:09:45 +02:00
Nicolas Florentin
ba8a8e5f1b admin can see reservations of a member 2023-09-14 09:13:40 +02:00
Du Peng
12b1ff5f0e Merge branch 'pre_inscription' into family_compte_pre_inscription 2023-09-11 17:59:14 +02:00
Vincent
dd2fcbd352 (ui) Remove liste style on statistics table 2023-09-06 15:52:05 +02:00
Du Peng
a10f3cffe4 (feat) statistics improvements 2023-09-01 12:43:36 +02:00
Du Peng
6b183969c7 Merge branch 'reservation-context' into dev 2023-08-24 10:37:53 +02:00
Du Peng
2a2c451d6e (bug) admin valid/pay event reservaiton error 2023-07-31 10:18:15 +02:00
Du Peng
8a3110cd0f (feat) add not valid status for event reservaiton 2023-07-26 15:48:14 +02:00
Nicolas Florentin
f466826e8b Fix a bug: hide project categories filter if there is no project categories, Improvement : dialog confirm to remove a project category 2023-07-21 10:21:08 +02:00
Nicolas Florentin
043ff6d47e wip 2023-07-20 16:55:22 +02:00
Du Peng
aa6aab48b2 (feat) admin cannot validate pre-registration > nb total places 2023-07-12 15:07:14 +02:00
Du Peng
3b5e087b7a (feat) family compte setting in panel 2023-07-12 12:47:35 +02:00
Du Peng
25d8b25808 (feat) add reservation status registered 2023-07-12 11:23:00 +02:00
Du Peng
e43d4918e1 (feat) show present status for pre registration evnet if amount == 0 2023-07-11 15:42:46 +02:00
Du Peng
8b4150a888 (feat) show age of child in event reservation 2023-07-11 14:17:03 +02:00
Du Peng
8771eb8ccc (feat) admin can confirm the prensence of pre-registration event 2023-07-11 13:53:41 +02:00
Du Peng
d271fa59e6 (feat) valid/invalid pre registration event 2023-07-11 10:36:44 +02:00
Vincent
a8dedfe040 (ui) Add radio buttons for event validation 2023-07-06 11:24:50 +02:00
Du Peng
e15bbf0b15 (feat) re-make event reservation item view 2023-07-04 15:05:46 +02:00
Du Peng
524404e7fa (feat) some improvements for family account 2023-07-04 15:05:45 +02:00
Du Peng
26cf72a846 (feat) pre-register event for family compte and nominatif 2023-07-04 15:05:41 +02:00
Du Peng
a60e587187 (feat) admin can confirm the payment of pre-registration reservation 2023-07-04 15:05:40 +02:00
Du Peng
172f09661f (wip) admin confirm payment of reservation pre-registration 2023-07-04 15:05:39 +02:00
Du Peng
0f9a5ff8af (feat) validate pre-registration reservation 2023-07-04 15:05:36 +02:00
Du Peng
26f1c939cd (feat) edit/delete child in members list 2023-07-04 15:01:24 +02:00
Vincent
d4b2b16425 (ui) integration 2023-07-04 15:01:20 +02:00
Du Peng
f6883ea43e (feat) show event booking users in member edit page 2023-07-04 15:01:12 +02:00
Du Peng
d08e4ff9cd (feat) admin can refuse child's supporting document file 2023-07-04 15:01:09 +02:00
Du Peng
ec1a736601 (feat) child validation 2023-07-04 15:01:06 +02:00
Du Peng
3d542ce6d4 (feat) add supporting document for child 2023-07-04 14:59:42 +02:00
Du Peng
04795ba629 (wip) show event reservation users 2023-07-04 14:59:01 +02:00
Du Peng
7d10132953 (feat) add Family account setting 2023-07-04 14:56:29 +02:00
Nicolas Florentin
a3a5527141 Merge branch 'project-categories' into projects-improvements 2023-07-03 14:32:35 +02:00
Nicolas Florentin
bc284e7813 filter projects by date 2023-07-03 11:42:29 +02:00
Nicolas Florentin
97c652f785 filter projects list by member 2023-06-29 14:32:06 +02:00
Nicolas Florentin
8217bb1a59 adds project categories 2023-06-29 08:47:42 +02:00
Sylvain
a24fe8cd71 Merge branch 'feature/each-reservation-deadlines' of https://github.com/Guichaguri/fab-manager into Guichaguri-feature/each-reservation-deadlines 2023-03-20 10:19:29 +01:00
Sylvain
98e58cbc25 (bug) fix invalid invoice reference 2023-03-20 10:13:42 +01:00
Guilherme Chaguri
855df4b552 Fix merge conflicts with dev 2023-03-15 16:26:45 -03:00
Sylvain
dad3babbe4 (ui) add alert on leaving plan form with unsaved changes 2023-03-13 14:19:48 +01:00
vincent
9294bc4c88 (ui) Plan form layout 2023-03-13 14:18:46 +01:00
Guilherme Chaguri
1aa9b2fe39 Added reservation deadlines for each type of reservation 2023-03-01 17:44:01 -03:00
Karen
35f2a69048 (feat) Add unsaved form alert and refreshed tabs on admin machines and trainings view 2023-02-15 10:30:09 +01:00
Karen
10de4fcf5e (bug) fix display of banners and add unsaved form alert on events banner 2023-02-15 10:30:06 +01:00
Sylvain
42e89ea1b0 (quality) do not load not shown components 2023-02-15 10:30:02 +01:00
Karen
0f6f763814 (feat) add custom banner on events 2023-02-15 10:29:58 +01:00
Sylvain
2b42858229 (feat) display special style if a training override general settings 2023-02-15 10:28:16 +01:00
Karen
a1eaa2eae7 (feat) machines custom banner frontend and frontend test 2023-02-15 10:28:09 +01:00