-
-
Notifications
You must be signed in to change notification settings - Fork 670
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.
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
[16.0][ADD] resource_multi_week_calendar #1384
Open
carmenbianca
wants to merge
14
commits into
OCA:16.0
Choose a base branch
from
coopiteasy:16.0-resource_multi_week_calendar
base: 16.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
[16.0][ADD] resource_multi_week_calendar #1384
carmenbianca
wants to merge
14
commits into
OCA:16.0
from
coopiteasy:16.0-resource_multi_week_calendar
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
carmenbianca
force-pushed
the
16.0-resource_multi_week_calendar
branch
3 times, most recently
from
August 30, 2024 11:59
9f3f079
to
4768f83
Compare
Signed-off-by: Carmen Bianca BAKKER <[email protected]>
…calendar This is the bones of the implementation. Signed-off-by: Carmen Bianca BAKKER <[email protected]>
Signed-off-by: Carmen Bianca BAKKER <[email protected]>
…atch This is the real implementation work. With this method implemented, all other methods correctly get the correct week each time. Signed-off-by: Carmen Bianca BAKKER <[email protected]>
The epoch date is hidden on the child anyway. Let's just hide it, and always make sure to get the parent's epoch date. This gets rid of the complicated computation stuff that won't backport well to v12. Signed-off-by: Carmen Bianca BAKKER <[email protected]>
…s attendances The idea here is that the children contain all the logic/attendances, and the parent is just a holder of children. Signed-off-by: Carmen Bianca BAKKER <[email protected]>
carmenbianca
force-pushed
the
16.0-resource_multi_week_calendar
branch
from
August 30, 2024 15:54
ebe510f
to
6c19789
Compare
Signed-off-by: Carmen Bianca BAKKER <[email protected]>
Signed-off-by: Carmen Bianca BAKKER <[email protected]>
Signed-off-by: Carmen Bianca BAKKER <[email protected]>
tagging @huguesdk , this is ready for review :) |
I need this elsewhere. It _technically_ reduces performance by doing the same calculation twice, but this module is horrible as pertains to performance in any case. Signed-off-by: Carmen Bianca BAKKER <[email protected]>
- `parent_calendar_id` is now `ondelete="cascade"`. - Renamed `family_calendar_ids` to `multi_week_calendar_ids`. - Renamed `current_calendar_id` to `current_multi_week_calendar_id`. - Renamed `_get_calendar` to `_get_multi_week_calendar`. Signed-off-by: Carmen Bianca BAKKER <[email protected]>
huguesdk
approved these changes
Sep 9, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
great work! 👍
Signed-off-by: Carmen Bianca BAKKER <[email protected]>
- Improved the comment on how week_sequence works. - Renamed family_size to calendar_count - Added a comment on _get_multi_week_calendar() returning a 1-item recordset. - Re-optimised the current week calculation. Signed-off-by: Carmen Bianca BAKKER <[email protected]>
…ndar Signed-off-by: Carmen Bianca BAKKER <[email protected]>
carmenbianca
force-pushed
the
16.0-resource_multi_week_calendar
branch
from
September 9, 2024 13:17
d5ae526
to
d0a05ee
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Allow a calendar to alternate between multiple weeks.
An implementation of this functionality exists in Odoo's
resource
module since version 13. In Odoo's implementation, you can only alternate between two weeks.This implementation is more generic.
At time of writing, it is heavily WIP.Internal task: T12626