item unit from state description

Signed-off-by: Mark Herwege <[email protected]>
openhab · Jul 1, 2023 · 0925db0 · 0925db0
1 parent 9653d2d
commit 0925db0
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/...rg.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/InputRenderer.java b/...rg.openhab.ui.basic/src/main/java/org/openhab/ui/basic/internal/render/InputRenderer.java
@@ -32,6 +32,7 @@
 import org.openhab.core.model.sitemap.sitemap.Input;
 import org.openhab.core.model.sitemap.sitemap.Widget;
 import org.openhab.core.types.State;
+import org.openhab.core.types.StateDescription;
 import org.openhab.core.types.UnDefType;
 import org.openhab.core.types.util.UnitUtils;
 import org.openhab.core.ui.items.ItemUIRegistry;
@@ -256,9 +257,20 @@ private String getUnit(Widget w, NumberItem item) {
  if (w.getLabel() != null) {
  unit = getUnitFromLabel(item, w.getLabel());
  }
+ // required when item is defined through UI and the label contains the value format pattern
  if ((unit != null) && unit.isBlank() && (item.getLabel() != null)) {
  unit = getUnitFromLabel(item, item.getLabel());
  }
+ // required when the value pattern is in the state description (text definition or meta data)
+ if ((unit != null) && unit.isBlank()) {
+ StateDescription stateDescription = item.getStateDescription();
+ if (stateDescription != null) {
+ String pattern = stateDescription.getPattern();
+ if (pattern != null) {
+ unit = getUnitFromLabel(item, "[" + pattern + "]");
+ }
+ }
+ }
  if (unit == null || unit.isBlank()) {
  unit = item.getUnitSymbol();
  }