Commit Graph

1214 Commits

Author SHA1 Message Date
Lauréline Guérin 50963bb083
manager: user_block used also in event detail page (#63915) 2022-06-13 15:04:09 +02:00
Valentin Deniaud 0b7ff2444d agendas: export time period weekday indexes (#65941) 2022-06-13 14:05:04 +02:00
Lauréline Guérin 4617dbdebb
api: new endpoint to get events and check status (#65770) 2022-06-10 14:21:24 +02:00
Lauréline Guérin 7ee7625f86
pricing: empty app (#65976) 2022-06-03 14:23:55 +02:00
Valentin Deniaud a4daeeeb67 api: ignore weekday_indexes when comparing WeekTime objects (#65849) 2022-06-02 11:03:28 +02:00
Lauréline Guérin 75c8a2abc0
misc: remove |get template filter from chrono (#65540)
it is defined publik-django-templatetags
2022-05-31 16:07:10 +02:00
Paul Marillonnet 81afbc271f api: patch booking color through dedicated endpoint (#65756) 2022-05-31 09:53:49 +02:00
Lauréline Guérin de59c38321
api: add category_label to agenda details (#65524) 2022-05-20 13:54:42 +02:00
Valentin Deniaud 0bceea5cad manager: display excluded periods for virtual agendas in date views (#65074) 2022-05-19 10:06:04 +02:00
Lauréline Guérin 53b4072ab9
pricing: fix dataclass use with List & py37 (#65370) 2022-05-17 18:43:23 +02:00
Lauréline Guérin 3db7658f6e
api: patch booking & user fields (#63913) 2022-05-17 15:44:18 +02:00
Lauréline Guérin 6a976dc889
translation update 2022-05-17 14:54:08 +02:00
Lauréline Guérin 889ea77c77
trivial: update translation strings 2022-05-17 14:53:26 +02:00
Lauréline Guérin 272c541b94
pricing: duplicate pricing model (#65231) 2022-05-17 13:40:23 +02:00
Lauréline Guérin fe16e1af83
pricing: import/export pricing_data (#65053) 2022-05-17 12:06:16 +02:00
Lauréline Guérin b308ddb240
pricing: edit pricing_data (#65053) 2022-05-17 12:06:16 +02:00
Lauréline Guérin f4920fd7f3
pricing: display agenda pricing matrix on detail page (#65053) 2022-05-17 12:06:16 +02:00
Lauréline Guérin 35600c2952
pricing: iter_pricing_matrix method (#65053) 2022-05-17 12:06:16 +02:00
Lauréline Guérin 7f85145858
pricing: pricing configuration on events agenda (#65053) 2022-05-17 12:06:16 +02:00
Lauréline Guérin 11f5fa3506
pricing: import/export pricing models (#64903) 2022-05-17 11:45:45 +02:00
Lauréline Guérin 1cd72eeebc
pricing: variable configuration (#64903) 2022-05-17 11:45:42 +02:00
Lauréline Guérin 4976df546a
pricing: categories can be reordered in a pricing model (#64903) 2022-05-17 11:45:42 +02:00
Lauréline Guérin 306ec0e5ce
pricing: configuration of pricing models (#64903) 2022-05-17 11:45:42 +02:00
Lauréline Guérin 81722913a4
pricing: add pricing variables (#64561) 2022-05-17 11:20:07 +02:00
Lauréline Guérin eb67f72b35
pricing: publik-django-templatetags integration (#64561) 2022-05-17 11:14:57 +02:00
Lauréline Guérin 687fe2e9c3
pricing: criterias can be ordered (#64746) 2022-05-17 10:54:37 +02:00
Lauréline Guérin 1b82b01fea
pricing - import/export categories (#64746) 2022-05-17 10:54:35 +02:00
Lauréline Guérin a5c5f63c83
pricing: configuration of criterias and categories (#64746) 2022-05-17 10:51:06 +02:00
Lauréline Guérin e504199eab
pricing: apply modifier according to booking status (#64565) 2022-05-17 10:25:34 +02:00
Lauréline Guérin 301d280c9e
pricing: get pricing data for event & users (#64562) 2022-05-17 09:51:13 +02:00
Lauréline Guérin f0e8197cd6
pricing: add models (#63808) 2022-05-17 09:25:30 +02:00
Emmanuel Cazenave 1ca5e77bd5 misc: use legacy urls to call up to date urls (#64344) 2022-05-16 15:46:50 +02:00
Valentin Deniaud e629fccaec api: forbid overlapping recurring events booking (#64383) 2022-05-16 10:58:35 +02:00
Valentin Deniaud b359c3f1ff api: forbid overlapping events booking (#64383) 2022-05-16 10:58:35 +02:00
Frédéric Péters 5bc6828342 settings: rename noop "gettext" call to N_ (#64997) 2022-05-09 13:47:53 +02:00
Frédéric Péters 70fe8b479f translation update 2022-05-03 22:38:08 +02:00
Lauréline Guérin ff2f877557
manager: fix check type form & pricing fields mutex (#64778) 2022-05-03 11:16:57 +02:00
Lauréline Guérin aee7d8c9f8
translation update 2022-05-03 10:40:58 +02:00
Valentin Deniaud 3fab3b136c api: configure shared custody agenda on creation (#64423) 2022-05-02 11:34:51 +02:00
Valentin Deniaud 513980d5b1 agendas: split name into first name and last name for shared custody (#64423) 2022-05-02 11:34:51 +02:00
Lauréline Guérin f70aa2063a
agendas: a check_type can be disabled (#63847) 2022-04-29 10:01:36 +02:00
Lauréline Guérin 0b38a91b2e
manager: warning on check_type edition if already used (#63847) 2022-04-29 10:01:36 +02:00
Lauréline Guérin 75044ae4f2
manager: do not delete used check types (#63847) 2022-04-29 10:01:36 +02:00
Lauréline Guérin 4b842886b0
manager: can not change check_type_group if bookings are using it (#63847) 2022-04-29 10:01:36 +02:00
Lauréline Guérin e2cd0d6ad6
agendas: Booking.user_check_type becomes a FK (#63847) 2022-04-29 10:01:36 +02:00
Lauréline Guérin a2350a6e36
agendas: add pricing fields to CheckType model (#63810) 2022-04-29 09:21:32 +02:00
Lauréline Guérin 3a1655adff
api: set presence reason on bookings (#63810) 2022-04-29 09:21:31 +02:00
Lauréline Guérin 30afa66e3f
manager: set presence reason on bookings (#63810) 2022-04-29 09:21:31 +02:00
Lauréline Guérin ae28ec5858
agendas: add kind field to CheckType model (#63810) 2022-04-29 09:21:31 +02:00
Lauréline Guérin 4547d00787
api: keep user_absence_reason field (#63810) 2022-04-29 09:21:31 +02:00
Lauréline Guérin b1c85499df
agendas: rename absence reason into check type (#63810) 2022-04-29 09:21:31 +02:00
Frédéric Péters 1c1e18a45b misc: add translatable label to events type field (#64323) 2022-04-22 14:27:25 +02:00
Valentin Deniaud f497445833 manager: show holiday name on shared custody month view (#63543) 2022-04-19 13:43:21 +02:00
Frédéric Péters a36ab59498 trivial: replace deprecated {% load staticfiles %} (#64287) 2022-04-17 10:59:59 +02:00
Frédéric Péters 9f07e949fc translation update 2022-04-15 21:18:00 +02:00
Frédéric Péters 808c8b7025 misc: remove usage of django.utils.six (#63685) 2022-04-15 18:20:50 +02:00
Lauréline Guérin d728a26447
api: mark bookings and cancellations as out of min delay (#63809) 2022-04-12 11:45:36 +02:00
Lauréline Guérin 0c9b65cead
api: include custom fields in events details (#63288) 2022-04-08 10:54:16 +02:00
Lauréline Guérin 51f554aeaf
manager: home, move links in burger menu (#63426) 2022-04-07 20:02:34 +02:00
Frédéric Péters c3d86c2a99 translation update 2022-04-07 19:43:04 +02:00
Lauréline Guérin c945f6b13f
api: configure custom fields on event (#63287) 2022-04-07 13:52:25 +02:00
Lauréline Guérin 7cd25676fc
manager: configure custom fields on event (#63287) 2022-04-07 13:52:24 +02:00
Lauréline Guérin 4ceb16a8e1
agendas: add custom_fields on Event model (#63287) 2022-04-07 13:52:24 +02:00
Lauréline Guérin f2a1a97940
api: configure events type on agenda (#63286) 2022-04-07 11:33:28 +02:00
Lauréline Guérin a732e05a6f
manager: configure events type on agenda (#63286) 2022-04-07 11:33:28 +02:00
Lauréline Guérin cdada0578b
manager: import/export resources (#62890) 2022-04-07 11:10:35 +02:00
Lauréline Guérin 96b5dc941f
manager: import/export events types (#63285) 2022-04-07 10:10:38 +02:00
Lauréline Guérin 597d88cce7
manager: custom fields edition (#63285) 2022-04-07 10:10:38 +02:00
Lauréline Guérin 4cfeb33d63
manager: backoffice pages to manage events types (#63285) 2022-04-07 10:10:37 +02:00
Lauréline Guérin 381ddf13e2
agendas: new model EventsType (#63285) 2022-04-07 10:02:07 +02:00
Lauréline Guérin 91fc242caa
misc: fix "import 'field' from line 26 shadowed by loop variable" 2022-04-07 10:02:07 +02:00
Lauréline Guérin 094cba528d
api: return status in multiple agendas datetimes (#63268) 2022-04-07 09:53:39 +02:00
Lauréline Guérin db5b7f3be7
misc: clean and simplify prefetch methods (#63268) 2022-04-07 09:01:04 +02:00
Lauréline Guérin 11efe9ce10
api: add backoffice_url to agenda details (#63183) 2022-04-04 17:34:09 +02:00
Lauréline Guérin f90f1452f9
manager: access to agenda redirect view with slug (#63183) 2022-04-04 17:34:09 +02:00
Valentin Deniaud 6d1e10328b translation update 2022-04-04 17:17:49 +02:00
Valentin Deniaud 050fa402f7 misc: remove feature flag from recurring event booking apis (#63521) 2022-04-04 17:03:19 +02:00
Valentin Deniaud afe588a1fb api: add shared custody support in recurring event list and fillslots (#63048) 2022-04-04 15:29:08 +02:00
Lauréline Guérin 9a8e19d0c6
api: add booking id and urls in events fillslot result (#63044) 2022-04-01 08:31:18 +02:00
Valentin Deniaud 5ca2fa0e91 agendas: add command to update shared custody holiday rules (#62801) 2022-03-31 15:02:19 +02:00
Valentin Deniaud 22d3a7e023 agendas: exceptional custody periods should override holiday rules (#62801) 2022-03-31 15:02:19 +02:00
Valentin Deniaud 7d0511aa78 agendas: add shared custody holiday rules (#62801) 2022-03-31 15:02:19 +02:00
Valentin Deniaud dcec0f2d3f agendas: add time period exception groups (#62801) 2022-03-31 15:02:19 +02:00
Emmanuel Cazenave 89289ad665 agendas: honor real agendas booking delay when booking through a virtual agenda (#63358) 2022-03-31 14:41:48 +02:00
Valentin Deniaud e957fdef68 agendas: remove excluded datetimes parameter from event creation methods (#63342) 2022-03-31 10:38:48 +02:00
Lauréline Guérin 387b08b7aa
agendas: fix import with bad datetimes (#62352) 2022-03-31 10:36:53 +02:00
Valentin Deniaud 26fdc69a95 api: allow events without recurrence end date in recurring event list (#63361) 2022-03-31 10:36:22 +02:00
Valentin Deniaud 5b8e840f69 agendas: enforce min_date in get_custody_slots (#63328) 2022-03-29 17:51:33 +02:00
Valentin Deniaud 78e0f50c85 translation update 2022-03-28 14:47:06 +02:00
Valentin Deniaud 9517800acd agendas: warn about special caracters for SMS reminder translation (#63080) 2022-03-28 14:44:06 +02:00
Valentin Deniaud f0602fb239 translation update 2022-03-28 11:40:57 +02:00
Valentin Deniaud 8487685feb agendas: allow exception sources in unavailability calendars (#52370) 2022-03-28 11:24:02 +02:00
Valentin Deniaud 885ecf664c manager: make time period exception source views more generic (#52370) 2022-03-28 11:24:02 +02:00
Valentin Deniaud c1938e3046 api: indicate possibility of future data in statistics (#62987) 2022-03-28 11:08:36 +02:00
Valentin Deniaud 4f81c65622 agendas: always create event recurrences in update method (#62635) 2022-03-28 10:29:48 +02:00
Valentin Deniaud b626b24800 agendas: remove useless subscription and shared custody code (#62635)
This includes partial revert of 56300815e7
and f158dc02ef.
2022-03-28 10:29:48 +02:00
Valentin Deniaud 7769ffabf6 agendas: simplify get_open_events method (#62635) 2022-03-28 10:29:48 +02:00
Valentin Deniaud d6cf33068b agendas: remove get_or_create_event_recurrence method (#62635) 2022-03-28 10:29:48 +02:00
Valentin Deniaud d707c0569c agendas: remove code creating event recurrence on the fly (#62635) 2022-03-28 10:29:48 +02:00
Valentin Deniaud 11fa0802ec agendas: stop adding event recurrences on the fly (#62635) 2022-03-28 10:29:48 +02:00
Valentin Deniaud ba38629af3 agendas: always create event recurrences (#62635) 2022-03-28 10:29:48 +02:00
Lauréline Guérin 939c1b0cff
agenda: fix booking delay around dst changes (#63202) 2022-03-25 17:47:08 +01:00
Valentin Deniaud eeeb0bf5af agendas: use pgettext_lazy rather than pgettext (#62908) 2022-03-17 16:21:14 +01:00
Valentin Deniaud 4c7430d03c manager: use checkboxes for weekday indexes selection (#62810) 2022-03-16 09:54:41 +01:00
Valentin Deniaud 638afb63aa translation update 2022-03-15 16:58:46 +01:00
Valentin Deniaud 5f413af3d1 manager: account for time period weekday indexes in calendar views (#45159) 2022-03-15 15:56:07 +01:00
Valentin Deniaud 7672c6edea api: account for time period weekday indexes (#45159) 2022-03-15 15:56:07 +01:00
Valentin Deniaud 956c1fd183 manager: choose time period weekday indexes (#45159) 2022-03-15 15:56:07 +01:00
Valentin Deniaud 6c067790e1 agendas: add weekday indexes to time period (#45159) 2022-03-15 15:56:07 +01:00
Valentin Deniaud 839a578bd0 utils: add function to get weekday index from date (#45159) 2022-03-15 15:56:07 +01:00
Valentin Deniaud d1df43fd7e translation update 2022-03-15 15:32:59 +01:00
Valentin Deniaud f158dc02ef api: make shared custody work with recurring events in datetimes (#62598) 2022-03-15 14:26:40 +01:00
Valentin Deniaud 6311c5146a api: check shared custody in multiple agendas fillslots (#62598) 2022-03-15 14:17:39 +01:00
Valentin Deniaud 5674a606ff api: filter on shared custody in multiple agendas datetimes (#62598) 2022-03-15 14:17:39 +01:00
Valentin Deniaud 0ec0604af5 translation update 2022-03-15 11:28:33 +01:00
Valentin Deniaud b102578e26 misc: fix strings for translation 2022-03-15 11:28:26 +01:00
Valentin Deniaud aaf66f3930 manager: test booking reminders sending (#61234) 2022-03-15 10:47:52 +01:00
Valentin Deniaud 52a45656a1 reminders: split send code (#61234) 2022-03-15 10:47:52 +01:00
Valentin Deniaud 064c9a4ea3 reminders: allow template syntax in message extra info (#61234) 2022-03-15 10:47:52 +01:00
Valentin Deniaud fc34aab1a8 api: flag category and agenda parameters as required in statistics (#62405) 2022-03-15 09:48:32 +01:00
Valentin Deniaud d82c194694 api: add shared custody views (#62146) 2022-03-15 09:47:26 +01:00
Valentin Deniaud c0679178ba manager: add shared custody views (#62146) 2022-03-15 09:47:26 +01:00
Valentin Deniaud 0fd2e6a51a manager: make some templates more generic (#62146) 2022-03-15 09:47:26 +01:00
Valentin Deniaud adad089c09 agendas: add shared custody models (#62146) 2022-03-15 09:47:23 +01:00
Valentin Deniaud 2ce8babd54 agendas: use event start_datetime when creating recurrences (#62611) 2022-03-15 09:46:42 +01:00
Lauréline Guérin 3e0c1e0250
translation update 2022-03-11 09:03:37 +01:00
Lauréline Guérin a5e6e1c2ac
manager: avoid 500 error on meetingtype duration update (#62461) 2022-03-11 08:26:07 +01:00
Emmanuel Cazenave f60d1498bc api: do not move desk max_datetime if not on a day boundary (#62590) 2022-03-09 15:00:19 +01:00
Lauréline Guérin 4e39702483
manager: fix page breaks in timesheet (#62378) 2022-03-04 08:47:00 +01:00
Lauréline Guérin dcaf185dd4
manager: fix views with bad month value (#62131) 2022-03-03 12:04:43 +01:00
Lauréline Guérin 35243bd6a1
misc: fix merge and form field ordering 2022-03-03 12:03:47 +01:00
Lauréline Guérin 7068021ef0
translation update 2022-03-03 12:02:09 +01:00
Lauréline Guérin 7432ced673
manager: add status filter on check page (#61974) 2022-03-03 11:18:13 +01:00
Lauréline Guérin 86f7cda771
manager: timesheet & check page ordering (#62043) 2022-03-03 10:48:32 +01:00
Lauréline Guérin 0625b88536
manager: timesheet grouper (#61920) 2022-03-03 10:31:55 +01:00
Lauréline Guérin da928de65a
translation update 2022-03-03 08:47:15 +01:00
Lauréline Guérin 4b708073d4
manager: timesheet and date display (#61070) 2022-03-03 08:20:32 +01:00
Lauréline Guérin 8ebbbfdfb7
manager: timesheet to PDF (#61070) 2022-03-03 08:20:32 +01:00
Lauréline Guérin 1f255d7ab9
manager: extra_data selection for timesheet (#61070) 2022-03-03 08:20:32 +01:00
Lauréline Guérin 0154debfb2
manager: timesheet generation (#61070) 2022-03-03 08:20:32 +01:00
Frédéric Péters 87e8203e07 misc: apply black 22.1.0 2022-03-01 19:36:25 +01:00
Lauréline Guérin 16f595bdba
manager: display cancelled bookings on check page (#61068) 2022-03-01 14:48:21 +01:00
Lauréline Guérin 56300815e7
api: fix get_open_events & get_past_events with subscribed (#62046) 2022-02-22 14:06:13 +01:00
Lauréline Guérin 2d5f2ee9ac
api: exclude subscribed start_date param (#61573) 2022-02-17 14:03:18 +01:00
Lauréline Guérin 03f834481a
manager: subscription end_date is excluded for check page (#61573) 2022-02-17 14:03:18 +01:00
Lauréline Guérin 9d53004c8c
api: the last day of a subscription is not bookable (#61573) 2022-02-17 14:03:18 +01:00
Lauréline Guérin 282da0a2de
api: exclude date_end on subscription update/delete (#61573) 2022-02-17 14:03:18 +01:00
Lauréline Guérin c5b542b359
api: subscription listing, date_end is excluded (#61573) 2022-02-17 14:03:18 +01:00
Lauréline Guérin 75bc19b333
api: subscription overlapping, date_end is excluded (#61573) 2022-02-17 14:03:18 +01:00
Lauréline Guérin df4e9f8104
api: exclude end_date in list booking endpoint (#61573) 2022-02-17 14:03:18 +01:00