OpenHAB
/
openhab-webui
mirror of https://github.com/openhab/openhab-webui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[BasicUI] Switch with buttons: value displayed if pattern on widget (#2579) 

When a Switch widget leads to the rendering with buttons, the value
should not be by default also displayed at the left of the buttons
(redundant information), except if it is requested through a state
pattern defined on the widget.

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
pull/2580/head
lolodomo 2024-05-18 17:32:37 +02:00 committed by GitHub
parent 2fd4267ebc
commit 37cfea2862
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bundles/org.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/SwitchRenderer.java
View File

@ -116,18 +116,27 @@ public class SwitchRenderer extends AbstractWidgetRenderer {
String snippet = getSnippet(snippetName);
State state = itemUIRegistry.getState(w);
snippet = preprocessSnippet(snippet, w);
if (nbButtons == 0) {
snippet = preprocessSnippet(snippet, w);
if (OnOffType.ON.equals(state)) {
snippet = snippet.replaceAll("%checked%", "checked=true");
} else {
snippet = snippet.replaceAll("%checked%", "");
}
} else {
// Show the value at left of all the buttons only if a state pattern is set on the sitemap widget
if (!hasValue(w.getLabel())) {
snippet = snippet.replace("%value%", "");
snippet = snippet.replace("%has_value%", "false");
}
snippet = preprocessSnippet(snippet, w);
snippet = snippet.replaceAll("%height_auto%", multiline ? "mdl-form__row--height-auto" : "");
snippet = snippet.replaceAll("%buttons_class%",
multiline ? "mdl-form__buttons-multiline" : "mdl-form__buttons");
StringBuilder buttons = new StringBuilder();
if (s.getMappings().isEmpty() && item != null) {
final CommandDescription commandDescription = item.getCommandDescription();