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

Merged
merged 11 commits into from
May 29, 2024
Merged

feat(Desk + PWA): Geolocation in Employee Checkin (backport #1642) #1824

merged 11 commits into from
May 29, 2024

Commits on May 29, 2024

  1. feat: geolocation in Employee Checkin 

    (cherry picked from commit e54e79b)

# Conflicts:
#	hrms/hr/doctype/employee_checkin/employee_checkin.json
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed May 29, 2024
    Configuration menu
    Copy the full SHA
    dcb55e5 View commit details
    Browse the repository at this point in the history

  2. feat(PWA): capture geolocation in checkins 

    (cherry picked from commit 9023723)

# Conflicts:
#	frontend/src/components/CheckInPanel.vue
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed May 29, 2024
    Configuration menu
    Copy the full SHA
    1132f91 View commit details
    Browse the repository at this point in the history

  3. style: add border-radius to map iframe 

    (cherry picked from commit 66259a6)
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed May 29, 2024
    Configuration menu
    Copy the full SHA
    4040acc View commit details
    Browse the repository at this point in the history

  4. fix: show fixed no of digits in location coordinates 

    (cherry picked from commit ad5407e)
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed May 29, 2024
    Configuration menu
    Copy the full SHA
    14b8e44 View commit details
    Browse the repository at this point in the history

  5. refactor: location handling 

    (cherry picked from commit 72a3084)
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed May 29, 2024
    Configuration menu
    Copy the full SHA
    0005da7 View commit details
    Browse the repository at this point in the history

  6. feat: HR Setting to enable geolocation tracking 

    (cherry picked from commit 74eeb3e)

# Conflicts:
#	frontend/src/components/CheckInPanel.vue
#	hrms/api/__init__.py
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed May 29, 2024
    Configuration menu
    Copy the full SHA
    609657f View commit details
    Browse the repository at this point in the history

  7. feat: split coordinates field into lat, long and set geolocation on v… 

    …alidate

(cherry picked from commit 239e1a4)

# Conflicts:
#	frontend/src/components/CheckInPanel.vue
#	hrms/hr/doctype/employee_checkin/employee_checkin.json
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed May 29, 2024
    Configuration menu
    Copy the full SHA
    7aad1ae View commit details
    Browse the repository at this point in the history

  8. feat(Desk): fetch geolocation btn in Employee Checkin form 

    (cherry picked from commit ced4969)

# Conflicts:
#	hrms/hr/doctype/employee_checkin/employee_checkin.json
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed May 29, 2024
    Configuration menu
    Copy the full SHA
    e49589f View commit details
    Browse the repository at this point in the history

  9. fix: skip setting geolocation if tracking is disabled 

    (cherry picked from commit 63e3b70)
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed May 29, 2024
    Configuration menu
    Copy the full SHA
    c886999 View commit details
    Browse the repository at this point in the history

  10. test: geolocation tracking 

    (cherry picked from commit 8773889)
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed May 29, 2024
    Configuration menu
    Copy the full SHA
    f114ba8 View commit details
    Browse the repository at this point in the history

  11. chore: fix conflicts

    @ruchamahabal
    ruchamahabal committed May 29, 2024
    Configuration menu
    Copy the full SHA
    2c46823 View commit details
    Browse the repository at this point in the history