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(Desk + PWA): Geolocation in Employee Checkin (backport #1642) #1824

Merged
merged 11 commits into from
May 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 29, 2024

HR Settings

image

Employee Checkin (Desk)

geolocation-desk.mp4

Employee Checkin (Mobile App)

RPReplay_Final1712117350.MP4

Errors handled

image image

Also if the setting is disabled, geolocation fields are hidden

image image
This is an automatic backport of pull request #1642 done by [Mergify](https://mergify.com).

(cherry picked from commit e54e79b)

# Conflicts:
#	hrms/hr/doctype/employee_checkin/employee_checkin.json
(cherry picked from commit 9023723)

# Conflicts:
#	frontend/src/components/CheckInPanel.vue
(cherry picked from commit 72a3084)
(cherry picked from commit 74eeb3e)

# Conflicts:
#	frontend/src/components/CheckInPanel.vue
#	hrms/api/__init__.py
…alidate

(cherry picked from commit 239e1a4)

# Conflicts:
#	frontend/src/components/CheckInPanel.vue
#	hrms/hr/doctype/employee_checkin/employee_checkin.json
(cherry picked from commit ced4969)

# Conflicts:
#	hrms/hr/doctype/employee_checkin/employee_checkin.json
(cherry picked from commit 8773889)
Copy link
Contributor Author

mergify bot commented May 29, 2024

Cherry-pick of e54e79b has failed:

On branch mergify/bp/version-15-hotfix/pr-1642
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit e54e79b27.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   hrms/hr/doctype/employee_checkin/employee_checkin.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/employee_checkin/employee_checkin.json

Cherry-pick of 9023723 has failed:

On branch mergify/bp/version-15-hotfix/pr-1642
Your branch is ahead of 'origin/version-15-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 90237231c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frontend/src/components/CheckInPanel.vue

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 74eeb3e has failed:

On branch mergify/bp/version-15-hotfix/pr-1642
Your branch is ahead of 'origin/version-15-hotfix' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 74eeb3e0c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   frontend/src/data/HRSettings.js
	deleted:    frontend/src/data/settings.js
	modified:   hrms/hr/doctype/hr_settings/hr_settings.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frontend/src/components/CheckInPanel.vue
	both modified:   hrms/api/__init__.py

Cherry-pick of 239e1a4 has failed:

On branch mergify/bp/version-15-hotfix/pr-1642
Your branch is ahead of 'origin/version-15-hotfix' by 6 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 239e1a499.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   hrms/hr/doctype/employee_checkin/employee_checkin.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frontend/src/components/CheckInPanel.vue
	both modified:   hrms/hr/doctype/employee_checkin/employee_checkin.json

Cherry-pick of ced4969 has failed:

On branch mergify/bp/version-15-hotfix/pr-1642
Your branch is ahead of 'origin/version-15-hotfix' by 7 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit ced4969cf.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   hrms/hr/doctype/employee_checkin/employee_checkin.js
	modified:   hrms/hr/doctype/employee_checkin/employee_checkin.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/employee_checkin/employee_checkin.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ruchamahabal
Copy link
Member

Unrelated flaky test failure

@ruchamahabal ruchamahabal merged commit 29ebc47 into version-15-hotfix May 29, 2024
6 of 7 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1642 branch May 29, 2024 18:16
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.22.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
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants