Repository navigation
skip holiday ole creation - #281
Merged
sonalimandarnarkar merged 1 commit intoJun 25, 2026
Merged
Conversation
Robera16
approved these changes
Jun 25, 2026
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
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.
Parent : https://git.phamos.eu/suncycle/suncycle/-/issues/2409
Issue : https://git.phamos.eu/suncycle/suncycle/-/work_items/2415
Description :
This pull request introduces logic to correctly handle "On Leave" status for employees on holidays or non-working days, ensuring that leave records and attendance are managed consistently and preventing the creation of inappropriate overtime ledger entries. It also adds comprehensive unit tests for these scenarios.
Workday status and leave/holiday handling:
Workday.update_statusto revert the status from "On Leave" or "Half Day" to "Not Workday" if the leave does not include holidays and the day is a non-working day, with supporting methods for determining non-working days and updating/cancelling related attendance records. [1] [2]_active_leave_includes_holiday,_should_revert_leave_to_not_workday,_apply_holiday_not_workday_fields, and_cancel_leave_attendance_on_non_working_dayto encapsulate and clarify the logic for handling holidays, leave, and attendance. [1] [2] [3]Testing improvements:
TestWorkdayHolidayLeaveOverrideto verify that the status reverts to "Not Workday" and that attendance creation is skipped for non-working days, including appropriate use of mocks and patching.test_workday.pyto include theWorkdayclass for direct testing.These changes ensure that leave and attendance logic respects holidays and non-working days, preventing incorrect overtime ledger entries and maintaining data integrity.