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.

Sign up for GitHub

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

Jump to bottom

feat(minor): Show leave allocation table in Leave Application on refresh hook #1375

Merged
merged 2 commits into from
Apr 17, 2024
Merged

feat(minor): Show leave allocation table in Leave Application on refresh hook #1375

merged 2 commits into from
Apr 17, 2024

Conversation

niraj2477
Copy link
Contributor

@niraj2477 niraj2477 commented Feb 2, 2024 •
edited by ruchamahabal
Loading

What's changed:

  • Show leave allocation dashboard on refresh hook. This will allow managers to view the leaves allocated all the time.

no-docs

Closes: #1360

@krantheman
Copy link
Collaborator

Currently, leaves of draft leave applications with status 'Open' fall under the Leaves Pending Approval column, but other statuses are ignored. Maybe all draft leave applications should be considered as Pending Approval.

@ruchamahabal thoughts?

@ruchamahabal ruchamahabal changed the title feat: Show leave allocation table on refresh hook feat(minor): Show leave allocation table on refresh hook Apr 17, 2024
@ruchamahabal ruchamahabal changed the title feat(minor): Show leave allocation table on refresh hook feat(minor): Show leave allocation table in Leave Application on refresh hook Apr 17, 2024
@ruchamahabal
Copy link
Member

Currently, leaves of draft leave applications with status 'Open' fall under the Leaves Pending Approval column, but other statuses are ignored. Maybe all draft leave applications should be considered as Pending Approval.

Yes makes sense. Can be covered in a separate PR

@ruchamahabal ruchamahabal merged commit 6060aed into frappe:develop Apr 17, 2024
4 of 5 checks passed
mergify bot pushed a commit that referenced this pull request Apr 17, 2024
@niraj2477 @mergify
feat(minor): Show leave allocation table in Leave Application on refr…
d75f660 
…esh hook (#1375)

* feat: Show leave allocation table on refresh hook

* fix: show dashboard on draft applications only

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 6060aed)
@mergify mergify bot mentioned this pull request Apr 17, 2024
Merged
ruchamahabal pushed a commit that referenced this pull request Apr 17, 2024
@mergify @niraj2477
feat(minor): Show leave allocation table in Leave Application on refr…
888d383 
…esh hook (backport #1375) (#1675)

* feat: Show leave allocation table on refresh hook

* fix: show dashboard on draft applications only

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 6060aed)

Co-authored-by: Niraj Gautam <nirajgautam196@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Apr 18, 2024
@frappe-bot
chore(release): Bumped to Version 15.19.0
77dcf83 
# [15.19.0](v15.18.0...v15.19.0) (2024-04-18)

### Bug Fixes

* conditional rendering for checkin ion-modal (backport [#1678](#1678)) ([#1679](#1679)) ([8afc06a](8afc06a))

### Features

* **minor:** Show leave allocation table in Leave Application on refresh hook (backport [#1375](#1375)) ([#1675](#1675)) ([888d383](888d383))
@ruchamahabal ruchamahabal mentioned this pull request Jun 7, 2024
Merged
This was referenced Jun 7, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruchamahabal ruchamahabal ruchamahabal approved these changes

Assignees
No one assigned
Labels
backport version-15-hotfix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Table with the allocated leaves disappears on Saving the Leave Application
3 participants
@niraj2477 @krantheman @ruchamahabal