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

Implement "forceAsItem" functionality for Charts in sitemaps (#2657) 

This is part of implementing #2185

Signed-off-by: Flole <flole@flole.de>
pull/2899/head
Flole998 2022-04-05 20:56:14 +02:00 committed by GitHub
parent 2a3e2e5567
commit 2de0fafc6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java
View File

@ -598,6 +598,7 @@ public class SitemapResource
bean.service = chartWidget.getService(); bean.service = chartWidget.getService();
bean.period = chartWidget.getPeriod(); bean.period = chartWidget.getPeriod();
bean.legend = chartWidget.getLegend(); bean.legend = chartWidget.getLegend();
bean.forceAsItem = chartWidget.getForceAsItem();
if (chartWidget.getRefresh() > 0) { if (chartWidget.getRefresh() > 0) {
bean.refresh = chartWidget.getRefresh(); bean.refresh = chartWidget.getRefresh();
} }

1
bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/WidgetDTO.java
View File

@ -51,6 +51,7 @@ public class WidgetDTO {
public String service; public String service;
public String period; public String period;
public Boolean legend; public Boolean legend;
public Boolean forceAsItem;
public String state; public String state;
public EnrichedItemDTO item; public EnrichedItemDTO item;

3
bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.xtext
View File

@ -58,7 +58,8 @@ Video:
Chart: Chart:
'Chart' (('item=' item=ItemRef) & ('label=' label=(ID | STRING))? & ('icon=' icon=Icon)? & 'Chart' (('item=' item=ItemRef) & ('label=' label=(ID | STRING))? & ('icon=' icon=Icon)? &
('service=' service=(STRING))? & ('refresh=' refresh=INT)? & ('period=' period=ID) & ('legend=' legend=BOOLEAN_OBJECT)? & ('service=' service=(STRING))? & ('refresh=' refresh=INT)? & ('period=' period=ID) &
('legend=' legend=BOOLEAN_OBJECT)? & ('forceasitem=' forceAsItem=BOOLEAN_OBJECT)? &
('labelcolor=[' (LabelColor+=ColorArray (',' LabelColor+=ColorArray)* ']'))? & ('labelcolor=[' (LabelColor+=ColorArray (',' LabelColor+=ColorArray)* ']'))? &
('valuecolor=[' (ValueColor+=ColorArray (',' ValueColor+=ColorArray)* ']'))? & ('valuecolor=[' (ValueColor+=ColorArray (',' ValueColor+=ColorArray)* ']'))? &
('visibility=[' (Visibility+=VisibilityRule (',' Visibility+=VisibilityRule)* ']'))?); ('visibility=[' (Visibility+=VisibilityRule (',' Visibility+=VisibilityRule)* ']'))?);

2
bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/components/UIComponentSitemapProvider.java
View File

@ -189,6 +189,8 @@ public class UIComponentSitemapProvider implements SitemapProvider, RegistryChan
setWidgetPropertyFromComponentConfig(widget, component, "refresh", SitemapPackage.CHART__REFRESH); setWidgetPropertyFromComponentConfig(widget, component, "refresh", SitemapPackage.CHART__REFRESH);
setWidgetPropertyFromComponentConfig(widget, component, "period", SitemapPackage.CHART__PERIOD); setWidgetPropertyFromComponentConfig(widget, component, "period", SitemapPackage.CHART__PERIOD);
setWidgetPropertyFromComponentConfig(widget, component, "legend", SitemapPackage.CHART__LEGEND); setWidgetPropertyFromComponentConfig(widget, component, "legend", SitemapPackage.CHART__LEGEND);
setWidgetPropertyFromComponentConfig(widget, component, "forceAsItem",
SitemapPackage.CHART__FORCE_AS_ITEM);
break; break;
case "Webview": case "Webview":
WebviewImpl webviewWidget = (WebviewImpl) SitemapFactory.eINSTANCE.createWebview(); WebviewImpl webviewWidget = (WebviewImpl) SitemapFactory.eINSTANCE.createWebview();