This repository has been archived by the owner on May 7, 2020. It is now read-only.
Feature time of day condition #6465 #6530
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
This condition checks if the current time is before, after, or equals to a time, which may be entered by the user. This is part of eclipse-archived#6465. Signed-off-by: Dominik Schlierf <dominik.schlierf.esh@web.de>
The time of day condition now compares if the current time is between a start and end time. Also supports wrapping around midnight, if the end time is before the start time. This is part of the issue eclipse-archived#6465. Signed-off-by: Dominik Schlierf <dominik.schlierf.esh@web.de>
In order to avoid overlapping of time conditions intervals the condition will no longer return true, if the current time is equals to the end of the time interval. This references eclipse-archived#6465 and was implemented due to a suggestion of @openhab-5iver. Signed-off-by: Dominik Schlierf <dominik.schlierf.esh@web.de>
Signed-off-by: Dominik Schlierf <dominik.schlierf.esh@web.de>
The launch configuration of the "org.eclipse.smarthome.automation.module.timer.test.launch" package was outdated and unable to run. This commit fixes that. Signed-off-by: Dominik Schlierf <dominik.schlierf.esh@web.de>
The DayOfWeekConditionHandlerTest provides a lot of functionality that may be used in the TimeOfDayConditionHandlerTest to test feature eclipse-archived#6465. In order to avoid duplicate code, a base class has been extracted. Also-by: Kai Kreuzer <kai@openhab.org> Signed-off-by: Dominik Schlierf <dominik.schlierf.esh@web.de>
This is a test that is based on the previously created BaseConditionHandlerTest. It is used to test the TimeOfDayConditionHandler which is part of feature eclipse-archived#6465. Signed-off-by: Dominik Schlierf <dominik.schlierf.esh@web.de>
davidgraeff
reviewed
Nov 19, 2018
| @Override | ||
| public boolean isSatisfied(Map<String, Object> inputs) { | ||
|
|
||
| String startTimeConfig = (String) module.getConfiguration().get(START_TIME); |
There was a problem hiding this comment.
An automation handler is recreated on configuration change. Please extract configuration in the contructor.
There was a problem hiding this comment.
Good to know! It is now :)
| String startTimeConfig = (String) module.getConfiguration().get(START_TIME); | ||
| String endTimeConfig = (String) module.getConfiguration().get(END_TIME); | ||
| if (startTimeConfig == null || endTimeConfig == null) { | ||
| logger.error("Time condition with id {} is not well configured: startTime={} endTime = {}", module.getId(), |
There was a problem hiding this comment.
The error log level is used for serious events only. A user configuration mistake is maximum a warning.
| } | ||
|
|
||
| LocalTime currentTime = LocalTime.now().truncatedTo(ChronoUnit.MINUTES); | ||
| LocalTime startTime = LocalTime.parse(startTimeConfig).truncatedTo(ChronoUnit.MINUTES); |
There was a problem hiding this comment.
Do this conversion in the constructor as well, e.g. can be assigned to final fields.
Added suggestions by @davidgraeff. Improves eclipse-archived#6564. Signed-off-by: Dominik Schlierf <dominik.schlierf.esh@web.de>
Improves eclipse-archived#6465. Signed-off-by: Dominik Schlierf <dominik.schlierf.esh@web.de>
Eseraz
force-pushed
the
feature_TimeOfDayCondition
branch
from
752a7ab to
5a02d00
Compare
kaikreuzer
approved these changes
Nov 29, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
As suggested in issue #6465, this adds a new type of condition that checks if the current time is in a certain time span. The time span can be configured by the user through a start time and an end time. The condition is able to wrap around the midnight mark, so you can specify times from 19.00 to 01.00 for example.
In Paper UI the selection of conditions looks like this:
And if you click on 'it is a certain time of day' you will get the configuration dialogue for the newly added TimeOfDayCondition.