Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

UI and asset type updates (#218)

Rich Turner4b2028d2e4fd
diff --git a/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.properties b/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.properties
index 8c6740da8..e9725c1be 100644
--- a/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.properties
+++ b/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.properties
@@ -320,7 +320,7 @@ metaItemDisplayName[urnopenremoteassetmetaattributeLink]=Attribute link
metaItemDisplayName[urnopenremoteassetmetalabel]=Label
metaItemDisplayName[urnopenremoteassetmetashowOnDashboard]=Show on dashboard
metaItemDisplayName[urnopenremoteassetmetaformat]=Format
-metaItemDisplayName[urn:openremote:asset:meta:unitType]=Units
+metaItemDisplayName[urnopenremoteassetmetaunitType]=Units
metaItemDisplayName[urnopenremoteassetmetadescription]=Description
metaItemDisplayName[urnopenremoteassetmetaabout]=About
metaItemDisplayName[urnopenremoteassetmetareadOnly]=Read only
diff --git a/model/src/main/java/org/openremote/model/asset/AssetType.java b/model/src/main/java/org/openremote/model/asset/AssetType.java
index c1cf98ed9..83517170e 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetType.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetType.java
@@ -63,7 +63,8 @@ public enum AssetType implements AssetDescriptor {
AGENT(ASSET_NAMESPACE + ":agent", "cogs", null),
- CONSOLE(ASSET_NAMESPACE + ":console", "monitor-cellphone", null),
+ CONSOLE(ASSET_NAMESPACE + ":console", "monitor-cellphone", null,
+ LOCATION),
MICROPHONE(ASSET_NAMESPACE + ":microphone", "microphone", "47A5FF",
new AttributeDescriptorImpl("manufacturer", STRING, null,
@@ -519,14 +520,18 @@ public enum AssetType implements AssetDescriptor {
LABEL.withInitialValue("System efficiency")),
new AttributeDescriptorImpl("totalPower", POWER, null,
LABEL.withInitialValue("Total power"),
- READ_ONLY),
+ READ_ONLY,
+ RULE_STATE,
+ STORE_DATA_POINTS),
new AttributeDescriptorImpl("forecastPowerDeviation", NUMBER, null,
LABEL.withInitialValue("Forecast power deviation"),
READ_ONLY),
new AttributeDescriptorImpl("totalEnergy", ENERGY, null,
LABEL.withInitialValue("Total energy"),
UNIT_TYPE.withInitialValue(UNITS_ENERGY_KILOWATT_HOUR),
- READ_ONLY),
+ READ_ONLY,
+ RULE_STATE,
+ STORE_DATA_POINTS),
new AttributeDescriptorImpl("panelOrientation", STRING, null,
LABEL.withInitialValue("Panel orientation"),
DESCRIPTION.withInitialValue("Direction the PV panels are facing"),
@@ -685,38 +690,58 @@ public enum AssetType implements AssetDescriptor {
LABEL.withInitialValue("User notes")),
new AttributeDescriptorImpl("temperature", TEMPERATURE, null,
LABEL.withInitialValue("Temperature"),
- READ_ONLY),
+ READ_ONLY,
+ RULE_STATE,
+ STORE_DATA_POINTS),
new AttributeDescriptorImpl("sunUvIndex", INTEGER, null,
LABEL.withInitialValue("UV Index of the sun"),
- READ_ONLY),
+ READ_ONLY,
+ RULE_STATE,
+ STORE_DATA_POINTS),
new AttributeDescriptorImpl("sunIrradiance", NUMBER, null,
LABEL.withInitialValue("Irradiance of the sun"),
UNIT_TYPE.withInitialValue(UNITS_POWER_PER_SQUARE_M),
- READ_ONLY),
+ READ_ONLY,
+ RULE_STATE,
+ STORE_DATA_POINTS),
new AttributeDescriptorImpl("sunAzimuth", INTEGER, null,
LABEL.withInitialValue("Azimuth of the sun"),
UNIT_TYPE.withInitialValue(UNITS_ANGLE_DEGREES),
- READ_ONLY),
+ READ_ONLY,
+ RULE_STATE,
+ STORE_DATA_POINTS),
new AttributeDescriptorImpl("sunZenith", INTEGER, null,
LABEL.withInitialValue("Zenith of the sun"),
UNIT_TYPE.withInitialValue(UNITS_ANGLE_DEGREES),
- READ_ONLY),
+ READ_ONLY,
+ RULE_STATE,
+ STORE_DATA_POINTS),
new AttributeDescriptorImpl("sunAltitude", NUMBER, null,
LABEL.withInitialValue("Altitude of the sun"),
UNIT_TYPE.withInitialValue(UNITS_ANGLE_DEGREES),
- READ_ONLY),
+ READ_ONLY,
+ RULE_STATE,
+ STORE_DATA_POINTS),
new AttributeDescriptorImpl("windSpeed", SPEED, null,
LABEL.withInitialValue("Wind speed"),
- READ_ONLY),
+ READ_ONLY,
+ RULE_STATE,
+ STORE_DATA_POINTS),
new AttributeDescriptorImpl("windDirection", DIRECTION, null,
LABEL.withInitialValue("Wind direction"),
- READ_ONLY),
+ READ_ONLY,
+ RULE_STATE,
+ STORE_DATA_POINTS),
new AttributeDescriptorImpl("precipitation", RAINFALL, null,
LABEL.withInitialValue("Precipitation"),
- READ_ONLY),
+ READ_ONLY,
+ RULE_STATE,
+ STORE_DATA_POINTS),
new AttributeDescriptorImpl("humidity", PERCENTAGE, null,
LABEL.withInitialValue("Humidity"),
- READ_ONLY)
+ READ_ONLY,
+ RULE_STATE,
+ STORE_DATA_POINTS)
);
final protected String type;
diff --git a/ui/app/or-app/src/pages/page-rules.ts b/ui/app/or-app/src/pages/page-rules.ts
index 06fb0716c..845aa5357 100644
--- a/ui/app/or-app/src/pages/page-rules.ts
+++ b/ui/app/or-app/src/pages/page-rules.ts
@@ -37,7 +37,6 @@ export const PAGE_RULES_CONFIG_DEFAULT: PageRulesConfig = {
descriptors: {
all: {
excludeAssets: [
- AssetType.BUILDING.type!,
AssetType.CITY.type!,
AssetType.AREA.type!,
AssetType.FLOOR.type!,