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

feat: leave type wise leave block dates #142

Merged
merged 11 commits into from
Nov 14, 2022
Merged

Conversation

rtdany10
Copy link
Contributor

This PR gives user the ability to block leave days by leave type.

Peek.2022-10-29.19-01.mp4

@rtdany10
Copy link
Contributor Author

Unrelated test failing.
@ruchamahabal please review the PR when you get time

@rtdany10
Copy link
Contributor Author

rtdany10 commented Nov 1, 2022

@ruchamahabal 😬

1 similar comment
@rtdany10
Copy link
Contributor Author

rtdany10 commented Nov 2, 2022

@ruchamahabal 😬

@codecov-commenter
Copy link

Codecov Report

Merging #142 (27d09b3) into develop (228ae5d) will decrease coverage by 0.06%.
The diff coverage is 55.17%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #142      +/-   ##
===========================================
- Coverage    70.84%   70.78%   -0.07%     
===========================================
  Files          178      178              
  Lines         8943     8960      +17     
===========================================
+ Hits          6336     6342       +6     
- Misses        2607     2618      +11     
Impacted Files Coverage Δ
.../hr/doctype/leave_application/leave_application.py 79.36% <ø> (+0.15%) ⬆️
...ms/hr/doctype/leave_block_list/leave_block_list.py 72.72% <55.17%> (-19.17%) ⬇️

@rtdany10
Copy link
Contributor Author

rtdany10 commented Nov 3, 2022

@ruchamahabal 😬

Copy link
Member

@ruchamahabal ruchamahabal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add test cases in the "leave block list" test controller for getting applicable block dates with leave type (single and all lists)

hrms/hr/doctype/leave_block_list/leave_block_list.js Outdated Show resolved Hide resolved
hrms/hr/doctype/leave_block_list/leave_block_list.py Outdated Show resolved Hide resolved
hrms/hr/doctype/leave_block_list/leave_block_list.js Outdated Show resolved Hide resolved
@rtdany10
Copy link
Contributor Author

rtdany10 commented Nov 5, 2022

@ruchamahabal I have added test cases, also modified the test data; added applies_to_all_departments on the first test record. Hope it's okay. We should add department wise test as well.

@rtdany10
Copy link
Contributor Author

rtdany10 commented Nov 9, 2022

@ruchamahabal please check

@ruchamahabal
Copy link
Member

added applies_to_all_departments on the first test record. Hope it's okay.

Any reason to do this?

@rtdany10
Copy link
Contributor Author

rtdany10 commented Nov 9, 2022

added applies_to_all_departments on the first test record. Hope it's okay.

Any reason to do this?

None of the test actually check for it, so while adding new test records, I added that key as well 😬

@rtdany10
Copy link
Contributor Author

rtdany10 commented Nov 11, 2022

@ruchamahabal 😬

1 similar comment
@rtdany10
Copy link
Contributor Author

@ruchamahabal 😬

@ruchamahabal
Copy link
Member

@rtdany10 thank you for the contribution.

A note for the future contributions: Avoid commit messages like feat: tests and review changes
Use messages describing the actual fix/feature/chore being implemented.

@ruchamahabal ruchamahabal merged commit dcffe3c into frappe:develop Nov 14, 2022
@rtdany10
Copy link
Contributor Author

Noted, will keep the commit message descriptive from now on.
Thank you @ruchamahabal

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

Successfully merging this pull request may close these issues.

3 participants