Feature/v2 add options for Teamlead self approve & System-Admin

KatjaGlassConsulting / ApprovalBundle

A Kimai Plugin to manage weekly approval workflow

MIT License

11 stars 14 forks source link

Feature/v2 add options for Teamlead self approve & System-Admin #34

Closed sammaclennan closed 7 months ago

sammaclennan commented 7 months ago

Addresses issue #32 - migration of Teamlead self approve & System-Admin features from v1 branch.

Tested and working well in my environment.

When team lead self-approve is enabled, the team lead will appear in their own 'To Approve' list, and approval option will appear in the 'Approved weeks report' view.
When System-Admin approval feature is enabled, System Admins will appear in the 'To Approve' view and in the 'Approved Weeks Report' view.

Feedback gratefully accepted - apologies for the messy commit history, unsure how to resolve but I assume it can be squashed during merge.

KatjaGlassConsulting commented 7 months ago

@kevinpapst - you wanted to be additionally reviewer for this PR? If you would like to provide feedback, I would be happy.

kevinpapst commented 7 months ago

Thanks for the PR @sammaclennan 👍

May I ask how you created the PR? From my understanding, you should have been able to cherry-pick the two commits that Katja added. From a quick glance, I can neither see Katjas commits in the history nor do I see the CHANGELOG.md changes, so first question is: what happened?

sammaclennan commented 7 months ago

Perhaps I'm incorrect, but I believe the branches have diverged enough that simply cherry-picking the commits across wouldn't have really worked - but again, I could be wrong about that.

It made the most sense to me to migrate the changes over in a way that was in-line with the functionality already in the branch.

I did forget to add to the CHANGELOG.md - I'll add a commit to remedy that now.