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.

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

fix(Shift Assignment): overlapping timings validation (backport #1932) #1984

Merged
merged 4 commits into from
Jul 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 17, 2024

This fixes two overlooked cases for overlapping shift timings (for the same date):-

Case 1

Shift 1:- 22:00 - 4:00

Shift 2:- 2:00 - 8:00

Shift 2 would be marked as overlapping even though it isn't. (Shift 1 starts 14 hours after Shift 2 ends)

Case 2

Shift 1:- 8:00 - 12:00

Shift 2:- 14:00 - 18:00

Shift 3:- 16:00 - 20:00

Shift 3 would not be marked as overlapping even though it is, with Shift 2.


This is an automatic backport of pull request #1932 done by Mergify.

- fix shift overlapping timings tests
- refactor tests to use helper functions and improve readability
- remove redundant test test_multiple_shift_assignments_for_same_day

(cherry picked from commit 155b815)
@mergify mergify bot requested a review from ruchamahabal as a code owner July 17, 2024 17:21
@ruchamahabal ruchamahabal merged commit e694a0e into version-15-hotfix Jul 17, 2024
7 of 8 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1932 branch July 17, 2024 17:42
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 15.24.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants