Skip to content

armgit / core

Public Imported from GitHub
0

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

Bug fix for attribute history non numeric data types

Rich Turner87615529a071
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.java b/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.java
index f0b4efa87..c63983983 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AbstractDatapointService.java
@@ -1,5 +1,6 @@
package org.openremote.manager.datapoint;
+import com.fasterxml.jackson.databind.JsonNode;
import org.hibernate.Session;
import org.hibernate.jdbc.AbstractReturningWork;
import org.openremote.container.persistence.PersistenceService;
@@ -313,7 +314,7 @@ public abstract class AbstractDatapointService<T extends Datapoint> implements C
try (ResultSet rs = st.executeQuery()) {
List<ValueDatapoint<?>> result = new ArrayList<>();
while (rs.next()) {
- Object value = rs.getObject(2) != null ? Values.getValueCoerced(rs.getObject(2), Double.class).orElse(null) : null;
+ Object value = rs.getObject(2) != null ? isNumber ? Values.getValueCoerced(rs.getObject(2), Double.class).orElse(null) : rs.getObject(2) instanceof PGobject ? Values.parse(((PGobject)rs.getObject(2)).getValue()).orElse(null) : Values.getValueCoerced(rs.getObject(2), JsonNode.class).orElse(null) : null;
result.add(new ValueDatapoint<>(rs.getTimestamp(1).getTime(), value));
}
return result.toArray(new ValueDatapoint<?>[0]);
diff --git a/ui/component/or-attribute-history/src/index.ts b/ui/component/or-attribute-history/src/index.ts
index 587a4b9b9..bfff30075 100644
--- a/ui/component/or-attribute-history/src/index.ts
+++ b/ui/component/or-attribute-history/src/index.ts
@@ -522,7 +522,7 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
return {
type: "prop",
header: prop,
- path: "$." + prop,
+ path: "$.['" + prop + "']",
stringify: typeof(value) === "object",
numeric: !isNaN(Number(value))
} as TableColumnConfig;
@@ -558,7 +558,10 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {
${this._data!.map((dp) => {
return html`
<tr class="mdc-data-table__row">
- ${config.columns!.map((c) => html`<td style="${c.styles ? styleMap(c.styles) : ""}" class="mdc-data-table__cell ${c.numeric ? "mdc-data-table__cell--numeric" : ""}">${this._getCellValue(dp, c, config.timestampFormat)}</td>`)}
+ ${config.columns!.map((c) => {
+ const value = this._getCellValue(dp, c, config.timestampFormat);
+ return html`<td style="${c.styles ? styleMap(c.styles) : ""}" class="mdc-data-table__cell ${c.numeric ? "mdc-data-table__cell--numeric" : ""}" title="${value}">${value}</td>`;
+ })}
</tr>
`;
})}