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: Progressive Web App - Leaves, Claims, Advances & Salary Slips #1041

Merged
merged 292 commits into from
Nov 7, 2023
Merged

feat: Progressive Web App - Leaves, Claims, Advances & Salary Slips #1041

merged 292 commits into from
Nov 7, 2023

Conversation

ruchamahabal
Copy link
Member

@ruchamahabal ruchamahabal commented Nov 6, 2023 •
edited
Loading

@ruchamahabal
feat(Holidays): show complete holiday list on clicking View All
6005f65
@ruchamahabal
refactor: separate out leave resources to a separate data file
d9a056c
@ruchamahabal
feat: show leaves this month
dada98f
@ruchamahabal
feat: cancel button for submitted leave
6b87298
@ruchamahabal
style: add bottom margin for leave layout
f50c311
@ruchamahabal
refactor: use List Resource for employee list
a552039
@ruchamahabal
feat: use socketio for realtime leave updates
6a873fa
@ruchamahabal
refactor: register dayjs utils globally
54508f4
@ruchamahabal
chore: bulk format code using prettier
f37f15b
@ruchamahabal
chore: ignore formatting changes in blame
425af0d
@ruchamahabal
Merge branch 'mobile' into pwa-starter
b4fcec2
@ruchamahabal
ci(temp): use develop branch for frappe and erpnext
fff0eea
@ruchamahabal
Merge pull request #595 from ruchamahabal/pwa-starter
86e2d8c 
feat: Mobile App Starter (PWA)
@ruchamahabal
Merge branch 'develop' into mobile
d64f70a
@ruchamahabal
feat: set up form, list routing for leaves
3900db2
@ruchamahabal
feat: Basic Formview and Fields Rendering
125a1f2
@ruchamahabal
refactor(UX): show title with docname in link fields
b1aab2b
@ruchamahabal
fix: bind attributes for fieldtypes
90d5e51
@ruchamahabal
feat: set up watchers for form fields to add scripts
48d21e3
@ruchamahabal
refactor: filter form fields to reduce noise
d969712
@ruchamahabal
feat: show error messages for field validations
9637b51
@ruchamahabal
feat: Leave Application form scripts - set, validate values
61513a7
@ruchamahabal
refactor: get all leave approval details in a single request
bf791e2
@ruchamahabal
fix: handle empty states in views
1b8b7c9
@ruchamahabal
feat: populate leave approvers and allocated leave types
7ce01d4
@ruchamahabal
feat: create document
5c0cb9a
@ruchamahabal
feat: disable save button until all the required fields are filled
9048f2b
@ruchamahabal
chore: bulk format code using prettier
920daa1
@ruchamahabal
chore: ignore formatting changes in blame
1675982
@ruchamahabal
fix: socketio port in config
4f4bee2
@codecov-commenter
Copy link

codecov-commenter commented Nov 7, 2023 •
edited
Loading

Codecov Report

Merging #1041 (8eb8ec0) into develop (6a821b4) will decrease coverage by 1.26%.
The diff coverage is 29.05%.

@@             Coverage Diff             @@
##           develop    #1041      +/-   ##
===========================================
- Coverage    73.90%   72.65%   -1.26%     
===========================================
  Files          195      199       +4     
  Lines        10430    10724     +294     
===========================================
+ Hits          7708     7791      +83     
- Misses        2722     2933     +211
Files Coverage Δ
hrms/hooks.py 100.00% <ø> (ø)
...ms/hr/doctype/pwa_notification/pwa_notification.py 100.00% <100.00%> (ø)
hrms/mixins/pwa_notifications.py 100.00% <100.00%> (ø)
hrms/hr/doctype/expense_claim/expense_claim.py 85.42% <92.30%> (+0.31%) ⬆️
.../hr/doctype/leave_application/leave_application.py 79.88% <92.30%> (+0.27%) ⬆️
hrms/payroll/doctype/salary_slip/salary_slip.py 86.75% <85.71%> (-0.11%) ⬇️
...ms/hr/doctype/employee_advance/employee_advance.py 88.73% <77.77%> (-0.75%) ⬇️
hrms/www/hrms.py 0.00% <0.00%> (ø)
hrms/api/__init__.py 0.00% <0.00%> (ø)

@ruchamahabal ruchamahabal marked this pull request as ready for review November 7, 2023 07:47
@ruchamahabal ruchamahabal changed the title feat: PWA feat: Progressive Web App Nov 7, 2023
@ruchamahabal ruchamahabal changed the title feat: Progressive Web App feat: Progressive Web App - Leaves, Claims, Advances & Salary Slips Nov 7, 2023
@ruchamahabal ruchamahabal merged commit c1299db into develop Nov 7, 2023
6 of 7 checks passed
@ruchamahabal
Copy link
Member Author

@Mergifyio backport version-15-hotfix

@mergify Mergify
Copy link
Contributor

mergify bot commented Nov 30, 2023 •
edited
Loading

backport version-15-hotfix

❌ No backport have been created

  • Backport to branch version-15-hotfix failed

Git reported the following error:

error: commit 771ac791d888010cd9beb06ec1efef9f60db9aec is a merge but no -m option was given.
fatal: cherry-pick failed

@mergify Mergify
Copy link
Contributor

mergify bot commented Nov 30, 2023

⚠️ The sha of the head commit of this PR conflicts with #1131. Mergify cannot evaluate rules on this PR. ⚠️

@frappe frappe deleted a comment from mergify bot Nov 30, 2023
@ruchamahabal ruchamahabal mentioned this pull request Nov 30, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
backport version-15-hotfix do not squash
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ruchamahabal @codecov-commenter