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

refactor: Leave Control Panel #809

Merged
merged 34 commits into from
Oct 10, 2023

Conversation

krantheman
Copy link
Member

@krantheman krantheman commented Aug 21, 2023

Closes: 782

Changes

  • Select Employees from a datatable populated with filtered employees as opposed to from a single Link field
  • Allocate Leave directly (by specifiying Leave Type), or via Leave Policy Assignment (Integration of Bulk Leave Policy Assignment)
  • Selection of dates based on Leave Period, Joining Date, or Custom Range
  • Other UI/UX changes

Allocation of leaves via Leave Policy

image

Allocation of leaves by selecting Leave Type

image

Docs: https://frappehr.com/docs/v14/en/leave-control-panel

@ruchamahabal ruchamahabal self-assigned this Aug 22, 2023
@codecov-commenter
Copy link

codecov-commenter commented Sep 13, 2023

Codecov Report

Merging #809 (35447a4) into develop (7090b9b) will increase coverage by 0.75%.
Report is 163 commits behind head on develop.
The diff coverage is 83.20%.

@@             Coverage Diff             @@
##           develop     #809      +/-   ##
===========================================
+ Coverage    72.98%   73.73%   +0.75%     
===========================================
  Files          194      195       +1     
  Lines         9990    10349     +359     
===========================================
+ Hits          7291     7631     +340     
- Misses        2699     2718      +19     
Files Coverage Δ
...leave_policy_assignment/leave_policy_assignment.py 88.02% <100.00%> (ø)
...doctype/leave_control_panel/leave_control_panel.py 82.48% <82.94%> (+82.48%) ⬆️

... and 23 files with indirect coverage changes

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.

Now the only thing that's stopping us from replacing Bulk Leave Policy Assignment dialog with this panel is the flexible filter group for applying filters on any employee field:

image

Can you add this? For reference check Dashboard Chart:

image image

Or Data Export:

image

https://github.com/frappe/frappe/blob/f2277b9254022e2e2365e01bd1ee1bb05288e844/frappe/public/js/frappe/data_import/data_exporter.js#L131-L138

Use frappe.FilterGroup

@ruchamahabal ruchamahabal merged commit bbb45a3 into frappe:develop Oct 10, 2023
7 checks passed
@krantheman krantheman deleted the leave_control_panel branch October 10, 2023 08:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

refactor: Leave Control Panel
3 participants