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

Disable/enable tray punch #117

Merged
merged 6 commits into from Oct 27, 2019
Merged

Disable/enable tray punch #117

merged 6 commits into from Oct 27, 2019

Conversation

@s-arika
Copy link
Contributor

s-arika commented Oct 24, 2019

Related issue

#70

Context / Background

Tray punch button now follows the behaviour of the punch time button. It is disabled if the day is a non-working day or if all entries have already been punched.

What change is being introduced by this PR?

I added an observer on the punch button to see if the attribute changes to disabled. The result of this condition will send the value to main, setting the enabled key in the contextMenuTemplate. The tray menu will be rebuilt on dynamic values.

s-arika added 2 commits Oct 24, 2019
main.js Outdated Show resolved Hide resolved
s-arika
js/calendar.js Outdated Show resolved Hide resolved
s-arika added 2 commits Oct 25, 2019
s-arika
s-arika
Copy link
Collaborator

tupaschoal left a comment

I think it looks great now!

Copy link
Owner

thamara left a comment

Looks good! Thanks @s-arika for the work!

@thamara thamara merged commit 7a015e3 into thamara:master Oct 27, 2019
9 checks passed
9 checks passed
build (8.x, ubuntu-latest)
Details
build (8.x, windows-latest)
Details
build (8.x, macOS-latest)
Details
build (10.x, ubuntu-latest)
Details
build (10.x, windows-latest)
Details
build (10.x, macOS-latest)
Details
build (12.x, ubuntu-latest)
Details
build (12.x, windows-latest)
Details
build (12.x, macOS-latest)
Details
@thamara thamara added this to the Version 1.3.0 milestone Oct 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.