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

Add break hours for calculating actual working hours #29

Closed
wants to merge 5 commits into from

Conversation

roquegv
Copy link
Contributor

@roquegv roquegv commented May 8, 2023

Solving #26

What is included:

  • Add break_minutes in Weekly Working Hours' child table.
    Captura de pantalla de 2023-05-08 15-48-16

  • Add "Expected Break Hours" and "Actual Working Hours" to Workday form.
    Captura de pantalla de 2023-05-08 15-47-59

  • Get "Expected Break Hours" and calculate "Actual Working Hours" within Workday form.
    Kazam_screencast_00032

  • Get "Expected Break Hours" and calculate "Actual Working Hours" within Workday list (using Process Workdays button).
    Kazam_screencast_00033

  • Update "Work Hour Report": add "Actual Working Hours", "Expected Break Hours", "Diff (Work Hours - Target Seconds)" and "Diff (Actual Working Hours - Target Seconds)" columns
    Captura de pantalla de 2023-05-08 15-52-25

@wojosc
Copy link
Contributor

wojosc commented May 9, 2023

@roquegv please do not PR into version-14 without having it thorowly tested first. I advice to create a "develop" branch and do the testing there first. @reggaetuna will then test this in a frappecloud instance. Once you have run all your tests, you can PR into version-14. Thank you.

@wojosc wojosc closed this May 9, 2023
@roquegv
Copy link
Contributor Author

roquegv commented May 9, 2023

@wojosc ok, I'll do that 👍

@roquegv
Copy link
Contributor Author

roquegv commented May 9, 2023

@wojosc could you please create a branch for making the pull request? I have no permissions to do that.
will be good to have a develop branch from version-14

@wojosc
Copy link
Contributor

wojosc commented May 9, 2023

@roquegv https://github.com/phamos-eu/HR-Addon/tree/develop done

Please be aware, that version-13 and master/main differ and probably can not be used in the same way. Let me know if you need any further branches. Also, I will check to make sure, that you have the permissions to do the same. Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants