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

57 Commits

Author SHA1 Message Date
Nicolas Florentin
bdc5729141 (feat) space associate machines 2023-08-24 14:41:29 +02:00
Du Peng
d7d996bc6d (feat) Ability to show all availabilities in calender for admin 2023-07-07 09:15:13 +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
328529809d (bug) plan visibility is not applied
(bug) plan limit error message
(quality) improved error message
(ui) plan visibility cannot be under 7
2023-03-16 12:02:08 +01:00
Guilherme Chaguri
855df4b552 Fix merge conflicts with dev 2023-03-15 16:26:45 -03:00
Sylvain
6089e636e4 (feat) limit machine visibility per plan 2023-03-15 14:17:06 +01:00
Guilherme Chaguri
1aa9b2fe39 Added reservation deadlines for each type of reservation 2023-03-01 17:44:01 -03:00
Sylvain
8669cc82da (bug) admin should see locked availabilities 2023-02-16 16:53:52 +01:00
Sylvain
fea26285d6 (feat) improved calendars loading time
+ (feat) ability to choose a machine in the public calendar
2023-02-15 10:29:55 +01:00
Sylvain
d0239a0e25 (wip) move slot status request 2023-02-15 10:29:55 +01:00
Sylvain
986a663c40 (feat) places cache for slots 2023-02-15 10:29:54 +01:00
Sylvain
9f9a2e616f (feat) slots/availabilities status for pending reservations 2023-02-15 10:29:54 +01:00
Sylvain
c24673fefa (quality) log errors to the JS console 2023-02-15 10:29:52 +01:00
Sylvain
eba0c99ae5 (bug) date shift in event creation/update 2023-02-14 16:47:06 +01:00
Sylvain
04f933f94d (bug) deal with DST using Time instead of DateTime 2023-02-14 13:10:58 +01:00
Sylvain
574974c239 (merge) Merge branch 'machine_category' into staging 2022-12-27 10:59:36 +01:00
Du Peng
bcd76ee6d5 (bug) always show machine availability in calender if machine module is inactive 2022-12-20 18:46:25 +01:00
Du Peng
f47440c85a (feat) add machine category 2022-12-20 18:45:53 +01:00
Guilherme Chaguri
dea9663f37 Added reservation deadline parameter 2022-11-29 17:02:01 -03:00
Sylvain
c710af04b7 (bug) slot title must only contains name of the requested resource 2022-07-19 15:56:21 +02:00
Sylvain
06ee1acea5 (bug) fix slot reservation is considered full 2022-07-19 15:40:28 +02:00
Sylvain
d26e2ae313 (bug) fix various issues due to slots behavior refactoring 2022-07-19 11:32:12 +02:00
Sylvain
e955ecc6f8 (bug) create slots when occurences is nil 2022-07-18 17:27:40 +02:00
Sylvain
6a8c441e85 public calendar endpoint refactoring & testing 2022-07-18 17:19:33 +02:00
Sylvain
b68e47a0ea refactor shopping_cart/reservation
Previsouly, the reservation was expecting parameters like:
slots_attributes: [{start_at: date, end_at: date, availability_id: number}]

Now, the reservation is expecting simpler parameters like:
slots_reservations_attributes:[{slot_id: number}]
2022-07-18 17:18:01 +02:00
Sylvain
37b24a8d2f refactor slots model 2022-07-18 17:18:01 +02:00
Sylvain
5012912edd (wip) refactoring Availabilities::AvailabilitiesService and Availabilities::StatusService 2022-07-18 17:18:01 +02:00
Sylvain
783e86d9cc (bug) fix slots creation 2022-07-18 17:18:00 +02:00
Sylvain
b2fd2e1b48 build all slots at reservation creation time 2022-07-18 17:18:00 +02:00
Du Peng
60e9ccd7ce Fix a bug: unable to show deleted user in reservation slot 2022-04-05 16:44:55 +02:00
Du Peng
a6c230145b Optimise sql query, avoid to N+1 2022-04-01 16:31:46 +02:00
Sylvain
e9185bd402 [bug] recurring availabilities are not restricted to subscribers 2021-03-22 10:43:45 +01:00
Sylvain
4b8504f531 fix tests 2020-06-10 11:52:54 +02:00
Sylvain
01017f3012 fix setting.get for boolean 2020-05-25 16:47:06 +02:00
Sylvain
98c63e8327 [bug] managers do not see the name of the user who reserved a slot 2020-05-25 16:35:21 +02:00
Sylvain
ba4c39ca99 use slot duration from the db setting 2020-05-25 12:55:01 +02:00
Sylvain
f80eb230ca refactored code to use Setting.get 2020-05-25 12:54:19 +02:00
Sylvain
bf57587301 [bug] recurrent availabilities do not keep the custom duration 2020-05-25 11:03:31 +02:00
Sylvain
47a0fca481 show all availabilities to managers 2020-05-06 12:56:12 +02:00
Sylvain
ff75a96ecc Ability to define, per availability, a custom duration for the reservation slots 2020-04-15 18:08:02 +02:00
Sylvain
97660924cb fix typo and wording 2020-01-21 11:16:49 +01:00
Du Peng
3c26c6d4bd disable add plan with reserve slot in the past 2020-01-20 16:17:10 +01:00
Du Peng
0143c3d495 allow admin reserve machine/space in the past time 2020-01-20 16:17:10 +01:00
Nicolas Florentin
77cf8c8218 replaces almost all Time.now by DateTime.current 2019-12-02 11:57:25 +01:00
Sylvain
bbd613f2a5 compute right nb of free seats for event reservation
also: copy nb_total_places to n+1 instances when creating recurrent
availabilities
2019-11-25 10:30:12 +01:00
Sylvain
9ec736e6b5 delete recursive slots 2019-11-18 17:29:51 +01:00
Sylvain
26738563bd create reccursive events 2019-11-18 11:50:20 +01:00
Sylvain
a60a39ff9e [ongoing] create multiple availabilities according to UI 2019-11-13 12:13:22 +01:00
Sylvain
bc36b78719 [bug] public calendar won't show anything if the current date range include a reserved space availability (#151) 2019-10-14 10:38:13 +02:00
Sylvain
a53c6e80e7 move invoice->operator to invoicing_profile + minor fixes to handle user deletion 2019-06-12 12:22:38 +02:00