engelsystem
add ability to mark work log as nightshift
This PR adds the ability to mark work logs as night shifts to apply the night bonus multiplier, implementing #710.
- added db column "night_shift" to worklogs table
- added night shift checkbox to edit-worklog view
- nightshift-work logs multiplied with nighshift muliplier in User_model
- nightshift info text (moon) added to User_view
This is my first PR for the engelsystem and I'm not fully familiar with the codebase. Please let me know if I can improve anything. Unit tests and the pre-commit hook ran successfully.
Please find screenshots of the adjusted views below:
User_view
edit-worklog
Thank you Xu for the review. I changed the "worklog sum" function from a function that returns the calculated value to one that returns the sql query (similar to the shift sum function). That way I can also use it in the admin_active page. But it feels like a decrease in code quality to me, if you have a better/cleaner idea please let me know.
I assume we wait with merging until #1481 is done? I can rebase then, doesn't seem to complicated to move my changes to the Goodie helper aswell.
Hi, do you have any update on this?
Hi and yes. I already rebased it and did the necessary adjustments, but I didn't have time to test it thoroughly. I hope I will get to it end of next week.
Here you go 🤗
I moved the logic to the Goodie helper and also updated the worklogScoreQuery to return an Expression like the shiftScoreQuery. ~As a result of that, the GoodieTest::testUserScore testcase needed to be adjusted and now barely tests anything, but I didn't want to remove your testcases and adjusted the assertion to expect 0. Please check if this is ok.~ nvm, I just needed to adjust the setup.
I also wasn't sure if you want me to rename the db migration to a current date, if yes, please say so.