Skip to content
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

Calendar: handling the move of repeating events from a calendar to another #1308

Merged
merged 10 commits into from Oct 31, 2023
Merged

Calendar: handling the move of repeating events from a calendar to another #1308

merged 10 commits into from Oct 31, 2023

Conversation

Chouhartem
Copy link
Contributor

This pull request proposes the following changes to fix the issue #1275:

  1. In the case where a single instance of a repeating event is moved from a calendar to another it is copied in the target calendar as a single event and added as an exception of the recurrence rules in the source calendar.
  2. Due to the current implementation of recurring event, it is not possible to perform the two cases described hereunder. Henceforth, these cases have been disabled in the UI.
    • Only move the first element of a repeating event (which contains the recurrence rules) from a calendar to another.
    • For the same reason, we cannot move a repeating event to another calendar from a certain date.
  3. Adding explanation messages in forms of warnings as to why these options don't appear in the confirmation popup.

@Chouhartem Chouhartem added the Calendar Related to CryptPad internal calendar app label Oct 24, 2023
@Chouhartem
calendar: Change newEvent behaviour
382230d 
In preparation for #1275:

- Change `newEvent` to take an event directly
  - It would be used to add a new event in the target calendar
@Chouhartem
calendar: copy-and-delete when moving an event one time from calendars
41be1b3 
#1275: Copy a calendar item then remove it.

WIP: does not work with the first recurring event (the origin).
@Chouhartem
Linter compliance
b7842cc
@Chouhartem
calendar: apply changes on the moved event
918fd3f 
#1275: from previous implementation, the changes were applied to the
original recurrent event and not the one in which has been moved
@Chouhartem
Moving the original event
39371de 
#1275: handle simple cases when moving the first element of a recurring
event to a new calendar.
@Chouhartem
calendar: confirmation dialog changes in case of changing calendar fo…
ec6e1a0 
…r recurring events

#1275: given the current implementation of recurring event, it is not
possible to move a group of events from a calendar to another.

- Disabling « Future event » if the user tries to move a recurring event
  from a calendar to another.
- Show a warning upon moving the first event to another calendar
  explaining why the user can only move the all events.
- Add a translation key for the above.
@Chouhartem
calendar: Use variables instead of inline test for readability
76101cc 
WIP for #1275
@Chouhartem
calendar: Improve warnings when changing recurring events' calendar
31cb795 
Related to issue #1275's changes.
@Chouhartem
#1275: typo
4184a15
@Chouhartem
calendar: avoid warning disappearance
dc52251 
#1275: forgot to handle the case where a user changes its option, which
made the warning disappear…
@Chouhartem Chouhartem force-pushed the 1275-changing-calendar-for-only-this-event-changes-it-for-all-events-in-a-repeated-event branch from 8a6a721 to dc52251 Compare October 26, 2023 07:45
@Chouhartem Chouhartem linked an issue Oct 27, 2023 that may be closed by this pull request
Changing calendar for "Only this event" changes it for all events in a repeated event #1275
Closed
@davidbenque davidbenque added this to the 5.6.0 milestone Oct 31, 2023
@yflory yflory merged commit b177e4b into staging Oct 31, 2023
@Chouhartem Chouhartem deleted the 1275-changing-calendar-for-only-this-event-changes-it-for-all-events-in-a-repeated-event branch November 21, 2023 11:56
Chouhartem added a commit to Chouhartem/cryptpad that referenced this pull request Dec 12, 2023
@Chouhartem
Code cleanup
c11f946 
Remove `XXX` comments related to PRs cryptpad#1308 and cryptpad#1312
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Calendar Related to CryptPad internal calendar app
Projects
None yet
Milestone
5.6.0
Development

Successfully merging this pull request may close these issues.

Changing calendar for "Only this event" changes it for all events in a repeated event
3 participants
@Chouhartem @yflory @davidbenque