Add DateTimeTrigger in rules configuration #1357
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Job #384: Bundle Size — 10.7MB (~-0.01%). |
ghys
requested changes
Apr 22, 2022
| @@ -153,6 +153,7 @@ | |||
| <f7-list> | |||
| <f7-list-item radio :checked="timeEventType === 'cron'" name="timeEventType" title="on a schedule (cron)" @click="updateTimeEventType('cron')" /> | |||
| <f7-list-item radio :checked="timeEventType === 'timeOfDay'" name="timeEventType" title="at a fixed time of the day" @click="updateTimeEventType('timeOfDay')" /> | |||
| <f7-list-item radio :checked="thingEventType === 'dateTime'" name="timeEventType" title="at the time specified in an item's state" @click="updateTimeEventType('dateTime')" /> | |||
There was a problem hiding this comment.
Suggested change
| <f7-list-item radio :checked="thingEventType === 'dateTime'" name="timeEventType" title="at the time specified in an item's state" @click="updateTimeEventType('dateTime')" /> | |
| <f7-list-item radio :checked="timeEventType === 'dateTime'" name="timeEventType" title="at the time specified in an item's state" @click="updateTimeEventType('dateTime')" /> |
| @@ -282,6 +283,10 @@ export default { | |||
| case 'timeOfDay': | |||
| this.$emit('typeSelect', 'timer.TimeOfDayTrigger', true) | |||
| break | |||
| case 'dateTime': | |||
| this.$emit('typeSelect', 'timer.DateTimeTrigger', true) | |||
| if (this.currentItem) this.$set(this.currentModule, 'configuration', Object.assign({}, { itemName: this.currentItem.name })) | |||
There was a problem hiding this comment.
this.currentItem isn't relevant when you choose a "Time event" trigger, only when you choose "Item event" (then the UI lets you pick an item (put into this.currentItem and only then you may choose the trigger type and configuration).
Since the generic config sheet is already displayed for these "Time event" triggers (so you'll be able to choose the item) I suppose there's nothing more to do than remove this line.
Signed-off-by: Jan N. Klug <github@klug.nrw>
Signed-off-by: Jan N. Klug <github@klug.nrw>
J-N-K
force-pushed
the
feature-datettimetrigger
branch
from
63cdbaa to
794938b
Compare
|
The core PR has been merged. |
ghys
approved these changes
Apr 25, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Depends on openhab/openhab-core#2923
Signed-off-by: Jan N. Klug github@klug.nrw