Skip to content

Add support for bookings with 'by weekday' repetition #5829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
ThiefMaster merged 52 commits into from
Oct 21, 2023
Merged

Add support for bookings with 'by weekday' repetition #5829

ThiefMaster merged 52 commits into from
Oct 21, 2023

Conversation

@GovernmentPlates
Copy link
Member

@GovernmentPlates GovernmentPlates commented Jun 28, 2023 •
edited
Loading

Closes: #5806

  • Implement weekday picker component (i18n, validation etc.)
  • Add component to booking landing, search filter options and edit booking modal (test)
  • Pass selected days & data to backend
  • Create migration for storing selected days (postgres string array, keep nullable, check constraints)
  • Modify existing backend rules for booking creation
  • Write test cases for recurrence_weekdays
  • Fix existing unit tests
  • Fix issues from testing
  • Cleanup/Refactor
  • Update changelog

@GovernmentPlates GovernmentPlates force-pushed the Recurring-Bookings-Byweekday-5806 branch 2 times, most recently from 8d4549a to 72bac30 Compare June 28, 2023 15:22
@GovernmentPlates GovernmentPlates marked this pull request as draft June 28, 2023 15:22
@tomasr8

This comment was marked as resolved.

Sign in to view
@ThiefMaster

This comment was marked as resolved.

Sign in to view
@GovernmentPlates GovernmentPlates self-assigned this Jul 3, 2023
@GovernmentPlates GovernmentPlates force-pushed the Recurring-Bookings-Byweekday-5806 branch 2 times, most recently from 8f76750 to f91539f Compare July 6, 2023 16:06
ThiefMaster
ThiefMaster reviewed Jul 7, 2023
View reviewed changes
@GovernmentPlates GovernmentPlates force-pushed the Recurring-Bookings-Byweekday-5806 branch 4 times, most recently from d2abc62 to 8c7bc5b Compare July 28, 2023 21:00
@GovernmentPlates GovernmentPlates force-pushed the Recurring-Bookings-Byweekday-5806 branch from 8c7bc5b to c3a5174 Compare August 16, 2023 14:09
@GovernmentPlates GovernmentPlates modified the milestones: v3.2, v3.3 Aug 17, 2023
@GovernmentPlates GovernmentPlates force-pushed the Recurring-Bookings-Byweekday-5806 branch from c3a5174 to ecb9f12 Compare August 17, 2023 20:38
ThiefMaster
ThiefMaster reviewed Aug 22, 2023
View reviewed changes
@ThiefMaster ThiefMaster force-pushed the Recurring-Bookings-Byweekday-5806 branch from b1cfe8f to 8332b2d Compare August 25, 2023 12:27
@GovernmentPlates GovernmentPlates force-pushed the Recurring-Bookings-Byweekday-5806 branch from 57abcaa to 6dcb2c5 Compare September 5, 2023 15:15
ThiefMaster
ThiefMaster reviewed Sep 5, 2023
View reviewed changes
@GovernmentPlates GovernmentPlates force-pushed the Recurring-Bookings-Byweekday-5806 branch from 6dcb2c5 to a93ecc8 Compare September 11, 2023 12:17
@GovernmentPlates GovernmentPlates force-pushed the Recurring-Bookings-Byweekday-5806 branch from a93ecc8 to 51d4eec Compare September 19, 2023 13:49
@ThiefMaster ThiefMaster force-pushed the Recurring-Bookings-Byweekday-5806 branch from 51d4eec to 32a97bb Compare September 25, 2023 10:34
ThiefMaster
ThiefMaster reviewed Sep 25, 2023
View reviewed changes
@GovernmentPlates GovernmentPlates force-pushed the Recurring-Bookings-Byweekday-5806 branch from ae3cdd7 to 692f7aa Compare September 25, 2023 19:53
ThiefMaster and others added 22 commits October 21, 2023 17:29
@ThiefMaster
Do not add new color to global palette
bf4d57b
@ThiefMaster
Improve comment + i18n placeholder
45a98f9
@ThiefMaster
Remove obsolete code
b6dc717
@ThiefMaster
Simplify reservation dates clamping
75139ad
@ThiefMaster
None is the default
85e1958
@ThiefMaster
Fix rst syntax
68aac9d
@ThiefMaster
Nicer code style
3aa5b14
@ThiefMaster
Validate weekdays
16b0947
@GovernmentPlates @ThiefMaster
Apply changes from review
7c2654a 
Merge booking edit check into a single if statement, use Translate tags, remove unnecessary disabled style from recurrence form.
@ThiefMaster
Enforce unique weekdays
44ad2d3
@ThiefMaster
Move recurrence_weekdays into repetition tuple
b2096f0
@ThiefMaster
Require weekdays to be null for non-weekly repetition
507fdae
@ThiefMaster
Fix weekday preselection when editing older weekly booking
3adb132
@ThiefMaster
Fix tests
ca8d811
@GovernmentPlates @ThiefMaster
Display recurring weekdays on timeline
5451969
@ThiefMaster
Include missing weekdays in calendar api as well
ed96945
@ThiefMaster
Improve recurrence tooltip
881df94
@GovernmentPlates @ThiefMaster
Improve booking tooltip, ensure start/end times are correct when edit…
b91413d 
…ing a booking
@ThiefMaster
Handle weekdays in repetition message generation
d747118
@ThiefMaster
Monthly bookings have no weekdays
84acc31
@GovernmentPlates @ThiefMaster
Improve weekdays on edit log
417564a
@ThiefMaster
Fix availability filter
cca3831
@ThiefMaster ThiefMaster force-pushed the Recurring-Bookings-Byweekday-5806 branch from da3b685 to cca3831 Compare October 21, 2023 15:30
@ThiefMaster ThiefMaster enabled auto-merge (squash) October 21, 2023 15:34
@ThiefMaster ThiefMaster merged commit 7409a93 into indico:master Oct 21, 2023
@ThiefMaster ThiefMaster deleted the Recurring-Bookings-Byweekday-5806 branch October 21, 2023 15:38
This was referenced Oct 23, 2023
Merged
Merged
OmeGak pushed a commit to UNOG-Indico/indico-core that referenced this pull request Oct 26, 2023
@SegiNyn @OmeGak
BACKPORT Fix when there is no user in rb_is_admin check
fb6b63e 
Partial backport of the following commit:
Add support for bookings with 'by weekday' repetition (indico#5829)
OmeGak pushed a commit to UNOG-Indico/indico-core that referenced this pull request Oct 26, 2023
@SegiNyn @OmeGak
BACKPORT Fix when there is no user in rb_is_admin check
586e0ad 
Partial backport of the following commit:
Add support for bookings with 'by weekday' repetition (indico#5829)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tomasr8 tomasr8 tomasr8 left review comments

@ThiefMaster ThiefMaster ThiefMaster approved these changes

Assignees

@GovernmentPlates GovernmentPlates

Labels

None yet

Projects

None yet

Milestone

v3.3

Development

Successfully merging this pull request may close these issues.

Recurring bookings with "byweekday" repetition

3 participants

@GovernmentPlates @tomasr8 @ThiefMaster