Add configuration flags to ActivityCalendar to keep events within business hours & days.#1004
Draft
joehybird wants to merge 2 commits into
Draft
Add configuration flags to ActivityCalendar to keep events within business hours & days.#1004joehybird wants to merge 2 commits into
joehybird wants to merge 2 commits into
Conversation
genglert
requested changes
Jul 23, 2025
| msgid "" | ||
| "The activity is not within the business hours range from {day_start} to " | ||
| "{day_end}." | ||
| msgstr "L'activité est en dehors des heures travaillées de {day_start} à {day_end}" |
Contributor
There was a problem hiding this comment.
Rename '0031_v2_7__calendarconfigitem_allow_event_anyday_n_overtime.py'
Comment on lines
+2101
to
+2104
| config = CalendarConfigItem(role=role) | ||
| config.allow_event_overtime = True | ||
| config.allow_event_anyday = True | ||
| config.save() |
Contributor
There was a problem hiding this comment.
config = CalendarConfigItem.objects.create(role=role, allow_event_overtime=True, allow_event_anyday=True)
Comment on lines
+2098
to
+2099
| user = self.create_user(role=role, password='test') | ||
| other_user = self.create_user(username='other', role=other_role, password='test') |
Contributor
There was a problem hiding this comment.
user1 = self.login_as_standard() # then use user1.role
user2 = self.create_user(index=1, role=self.get_regular_role()) # then use user2.role
(You are creating 2 users with the same first_name/last_name)
Comment on lines
+402
to
+405
| owner = get_user_model().filter(pk=activity.user_id).first() | ||
|
|
||
| if owner is None: | ||
| owner = user |
Contributor
There was a problem hiding this comment.
If I understand sometimes the owner of the activity has not been assigned yet
- A simpler code would be
owner = activity.user if activity.user_id else user - I do not understand the logic. I presume the hours constraints concern the participants, & so the activity should be checked with the config items of the users participants; the owner of the activity & the logged user seem not relevant.
Contributor
Author
There was a problem hiding this comment.
Great, you've gone straight to the point that is bothering me 😅 : whom constraint should be used ?
I didn't though about the participants... If I understand we should apply the constraints of ALL the participants to the event movement. 🤔
joehybird
force-pushed
the
fix/calendar_forbid_events_for_days_off
branch
from
14cdc28 to
b5c8a71
Compare
…/move/resize outside business hours & days.
joehybird
force-pushed
the
fix/calendar_forbid_events_for_days_off
branch
from
b5c8a71 to
d066117
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.